[Emacs-diffs] emacs-25 b52ebd4: org-map-entries: Fix org-agenda-prepare-buffers call

[Phillip Lord]

branch: emacs-25
commit b52ebd4f20ecc3f207a88cf7ac18c745b6e8ef80
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>

    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 @@ a *different* entry, you cannot use these techniques."
          (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 @@ a *different* entry, you cannot use these techniques."
              (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)