Re: bug#23365 and Org-mode for 25.1

[phillip.lord@russet.org.uk (Phillip Lord)]

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

John Wiegley <jwiegley@gmail.com> writes:

>>>>>> Phillip Lord <phillip.lord@russet.org.uk> writes:
>
>> I've submitted a bug recently on org-mode (#23365) which is present in
>> Emacs-25 head, but has been fixed in the org-mode on ELPA.
>
>> Is org-mode in core going to be sync'd before 25.1?
>
> No, I've spoken to the Org-mode maintainer about this, and it's too late in
> the game for such a large upgrade. Org 8.3 has some rather major changes, and
> we haven't had it in enough pretests to know what the impact will be now.
> However, it's welcome in 25.2.

Okay, no worries.

I've made a patch based on this commit:

http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=44c8cd7136e3fcd1e6bfa08895cac437b7a691fa

identifed by Kaushal Modi on the org-mode mailing list.

Is it okay to apply this backport to emacs-25



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-map-entries-Fix-org-agenda-prepare-buffers-call.patch --]
[-- Type: text/x-diff, Size: 1421 bytes --]

From 51d927a6479fdfca1ef58086d4fd70f394238f7d Mon Sep 17 00:00:00 2001
From: Phillip Lord <phillip.lord@newcastle.ac.uk>
Date: Sat, 30 Apr 2016 08:43:39 +0100
Subject: [PATCH] org-map-entries: Fix org-agenda-prepare-buffers call

* lisp/org.el (org-map-entries): Check that buffer-file-name is non-nil
  before passing to org-agenda-prepare-buffers.

This is a backport of commit 44c8cd7136e3fcd1e6bfa08895cac437b7a691fa
from upstream org-mode. Addresses bug #23365.
---
 lisp/org/org.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 231daa9..61bcb45 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -15069,7 +15069,7 @@ org-map-entries
 	  (if (not scope)
 	      (progn
 		(org-agenda-prepare-buffers
-		 (list (buffer-file-name (current-buffer))))
+		 (and buffer-file-name (list buffer-file-name)))
 		(setq res (org-scan-tags func matcher todo-only start-level)))
 	    ;; Get the right scope
 	    (cond
@@ -15081,7 +15081,7 @@ org-map-entries
 	      (setq scope (org-agenda-files t))
 	      (setq scope (org-add-archive-files scope)))
 	     ((eq scope 'file)
-	      (setq scope (list (buffer-file-name))))
+	      (setq scope (and buffer-file-name (list buffer-file-name))))
 	     ((eq scope 'file-with-archives)
 	      (setq scope (org-add-archive-files (list (buffer-file-name))))))
 	    (org-agenda-prepare-buffers scope)
-- 
2.8.1