summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-08-10 12:19:13 -0400
committerKyle Meyer <kyle@kyleam.com>2015-08-10 12:19:13 -0400
commit44c8cd7136e3fcd1e6bfa08895cac437b7a691fa (patch)
tree6c7cae74b7d93ccde95a3519c398fd965c11613d
parent07a2d3d6f5cd56b915d413190802ef81988ba260 (diff)
downloadorg-mode-44c8cd7136e3fcd1e6bfa08895cac437b7a691fa.tar.gz
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. Like 11e8749, this surfaced as an error when 05efa7a ("Backport commit 3a5f751 from Emacs master branch", 2015-08-08) replaced a '(while (setq VAR (pop LIST)) BODY)' with '(dolist (VAR LIST) BODY)', resulting in the body being executed when '(nil)' was passed to org-agenda-prepare-buffers. Reported-by: Robert Klein <roklein@roklein.de> <http://permalink.gmane.org/gmane.emacs.orgmode/99779>
-rwxr-xr-xlisp/org.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d0ef7a6..b9fed4f 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15490,7 +15490,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
@@ -15502,7 +15502,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)