summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-30 00:50:11 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-30 00:50:11 +0100
commit2567fee3c9039fbfdb93fea459738d2c0fed132b (patch)
tree158db10b9b6db17e36fd4f559e6328e3b914a70d
parent5c91976b4958117e8b746de818df34cb7a540a87 (diff)
downloadorg-mode-2567fee3c9039fbfdb93fea459738d2c0fed132b.tar.gz
Fix Org corruption when `org-agenda-files' is invalid
* lisp/org.el (org-install-agenda-files-menu): Prevent errors in `org-agenda-files' from corrupting Org initialization. Reported-by: Allen Li <vianchielfaura@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-10/msg00424.html>
-rw-r--r--lisp/org.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d7fff02..5da51ce 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -21577,7 +21577,9 @@ Your bug report will be posted to the Org mailing list.
["Cycle through agenda files" org-cycle-agenda-files t]
["Occur in all agenda files" org-occur-in-agenda-files t]
"--")
- (mapcar 'org-file-menu-entry (org-agenda-files t))))))))
+ (mapcar 'org-file-menu-entry
+ ;; Prevent initialization from failing.
+ (ignore-errors (org-agenda-files t)))))))))
;;;; Documentation