[PATCH] Fix agenda follow mode to work with included diary

[PATCH] Fix agenda follow mode to work with included diary

[Matt Lundin]

* lisp/org-agenda.el (org-agenda-goto): Fix org-agenda-goto to work with
  non-org buffers. Otherwise org-agenda-follow-mode does not work
  correctly with included diary entries (e.g., it errors out while the
  cursor is still in the diary buffer).
---
 lisp/org-agenda.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 5fd1cd4..0698ddf 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -8391,13 +8391,13 @@ When called with a prefix argument, include all archive files as well."
       (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
-    (recenter (/ (window-height) 2))
-    (org-back-to-heading t)
-    (if (re-search-forward org-complex-heading-regexp nil t)
-	(goto-char (match-beginning 4)))
+	     (org-flag-heading nil)))	; show the next heading
+      (when (outline-invisible-p)
+	(show-entry))			; display invisible text
+      (recenter (/ (window-height) 2))
+      (org-back-to-heading t)
+      (if (re-search-forward org-complex-heading-regexp nil t)
+	  (goto-char (match-beginning 4))))
     (run-hooks 'org-agenda-after-show-hook)
     (and highlight (org-highlight (point-at-bol) (point-at-eol)))))
 
-- 
2.5.0

[PATCH] Fix agenda follow mode to work with included diary

[Matt Lundin]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

Follow mode does not work with diary entries in the agenda. It calls
org-agenda-goto, which expects to be in an Org Mode buffer but does not
test to make sure that it is in an org buffer. As a result, it errors
out midway through and leaves the cursor stranded in the diary buffer.
This patch should fix the issue.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix-follow-mode.patch --]
[-- Type: text/x-diff, Size: 1600 bytes --]

From: Matt Lundin <mdl@imapmail.org>
To: Org Mode <emacs-orgmode@gnu.org>
Subject: [PATCH] Fix agenda follow mode to work with included diary
Date: Mon, 24 Aug 2015 10:20:35 -0500
Gcc: nnml:list.orgmode

* lisp/org-agenda.el (org-agenda-goto): Fix org-agenda-goto to work with
  non-org buffers. Otherwise org-agenda-follow-mode does not work
  correctly with included diary entries (e.g., it errors out while the
  cursor is still in the diary buffer).
---
 lisp/org-agenda.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 5fd1cd4..0698ddf 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -8391,13 +8391,13 @@ When called with a prefix argument, include all archive files as well."
       (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
-    (recenter (/ (window-height) 2))
-    (org-back-to-heading t)
-    (if (re-search-forward org-complex-heading-regexp nil t)
-	(goto-char (match-beginning 4)))
+	     (org-flag-heading nil)))	; show the next heading
+      (when (outline-invisible-p)
+	(show-entry))			; display invisible text
+      (recenter (/ (window-height) 2))
+      (org-back-to-heading t)
+      (if (re-search-forward org-complex-heading-regexp nil t)
+	  (goto-char (match-beginning 4))))
     (run-hooks 'org-agenda-after-show-hook)
     (and highlight (org-highlight (point-at-bol) (point-at-eol)))))
 
-- 
2.5.0

Re: [PATCH] Fix agenda follow mode to work with included diary

[Nicolas Goaziou]

Hello,

Matt Lundin <mdl@imapmail.org> writes:

> Follow mode does not work with diary entries in the agenda. It calls
> org-agenda-goto, which expects to be in an Org Mode buffer but does not
> test to make sure that it is in an org buffer. As a result, it errors
> out midway through and leaves the cursor stranded in the diary buffer.
> This patch should fix the issue.

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou