ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-07 02:14:00 +02:00
parent 00ba78c78d 134d5983ec
commit ac29de7241
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org-agenda.el
View File

@ -8593,7 +8593,9 @@ It also looks at the text of the entry itself."
(symbol-value var)))))) (symbol-value var))))))
(defun org-agenda-switch-to (&optional delete-other-windows) (defun org-agenda-switch-to (&optional delete-other-windows)
"Go to the Org-mode file which contains the item at point." "Go to the Org mode file which contains the item at point.
When optional argument DELETE-OTHER-WINDOWS is non-nil, the
displayed Org file fills the frame."
(interactive) (interactive)
(if (and org-return-follows-link (if (and org-return-follows-link
(not (org-get-at-bol 'org-marker)) (not (org-get-at-bol 'org-marker))
@ -8605,17 +8607,11 @@ It also looks at the text of the entry itself."
(pos (marker-position marker))) (pos (marker-position marker)))
(unless buffer (user-error "Trying to switch to non-existent buffer")) (unless buffer (user-error "Trying to switch to non-existent buffer"))
(org-pop-to-buffer-same-window buffer) (org-pop-to-buffer-same-window buffer)
(and delete-other-windows (delete-other-windows)) (when delete-other-windows (delete-other-windows))
(widen) (widen)
(goto-char pos) (goto-char pos)
(org-back-to-heading t)
(when (derived-mode-p 'org-mode) (when (derived-mode-p 'org-mode)
(org-show-context 'agenda) (org-show-context 'agenda)
(save-excursion
(and (outline-next-heading)
(org-flag-heading nil))) ; show the next heading
(when (outline-invisible-p)
(show-entry)) ; display invisible text
(run-hooks 'org-agenda-after-show-hook))))) (run-hooks 'org-agenda-after-show-hook)))))
(defun org-agenda-goto-mouse (ev) (defun org-agenda-goto-mouse (ev)