diff options
| author | Bastien Guerry <bzg@altern.org> | 2011-10-21 17:57:40 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2011-10-21 17:57:40 +0200 |
| commit | f79679077906b6f4e9f1ea1b26a7caab1007e80d (patch) | |
| tree | aebd979c451fb1d10d0aeccd14fcc836cb22d0da | |
| parent | 5091facd7f4ec80cce86049d6d84a164cb017970 (diff) | |
| parent | a1ebd4e2071da5edf3ba728acf908c98392ea29f (diff) | |
| download | org-mode-f79679077906b6f4e9f1ea1b26a7caab1007e80d.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | lisp/org-agenda.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 3d89c63..cbe36af 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6784,13 +6784,13 @@ When called with a prefix argument, include all archive files as well." (defun org-agenda-do-context-action () "Show outline path and, maybe, follow mode window." (let ((m (org-get-at-bol 'org-marker))) - (if (and org-agenda-follow-mode m) - (if org-agenda-follow-indirect - (org-agenda-tree-to-indirect-buffer) - (org-agenda-show))) - (if (and m org-agenda-show-outline-path) - (org-with-point-at m - (org-display-outline-path t))))) + (when (and (markerp m) (marker-buffer m)) + (and org-agenda-follow-mode + (if org-agenda-follow-indirect + (org-agenda-tree-to-indirect-buffer) + (org-agenda-show))) + (and org-agenda-show-outline-path + (org-with-point-at m (org-display-outline-path t)))))) (defun org-agenda-show-priority () "Show the priority of the current item. |