0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 14:10:42 +00:00

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-10-21 17:57:40 +02:00
commit f796790779

View file

@ -6784,13 +6784,13 @@ When called with a prefix argument, include all archive files as well."
(defun org-agenda-do-context-action () (defun org-agenda-do-context-action ()
"Show outline path and, maybe, follow mode window." "Show outline path and, maybe, follow mode window."
(let ((m (org-get-at-bol 'org-marker))) (let ((m (org-get-at-bol 'org-marker)))
(if (and org-agenda-follow-mode m) (when (and (markerp m) (marker-buffer m))
(and org-agenda-follow-mode
(if org-agenda-follow-indirect (if org-agenda-follow-indirect
(org-agenda-tree-to-indirect-buffer) (org-agenda-tree-to-indirect-buffer)
(org-agenda-show))) (org-agenda-show)))
(if (and m org-agenda-show-outline-path) (and org-agenda-show-outline-path
(org-with-point-at m (org-with-point-at m (org-display-outline-path t))))))
(org-display-outline-path t)))))
(defun org-agenda-show-priority () (defun org-agenda-show-priority ()
"Show the priority of the current item. "Show the priority of the current item.