From 82de7dafa31da88ac14d63920b4deca384ad1617 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 1 Nov 2014 12:02:47 +0100 Subject: [PATCH] Fix "Symbol nil may not be buffer-local" error * lisp/org.el (org-set-regexps-and-options): Fix "Symbol nil may not be buffer-local" error when encountering an nonexistent startup keyword. Reported-by: Mike McLean --- lisp/org.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 5b2082e0c..84b078673 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -4989,12 +4989,13 @@ related expressions." (let ((startup (cdr (assq 'startup alist)))) (dolist (option startup) (let ((entry (assoc-string option org-startup-options t))) - (let ((var (nth 1 entry)) - (val (nth 2 entry))) - (if (not (nth 3 entry)) (org-set-local var val) - (unless (listp (symbol-value var)) - (org-set-local var nil)) - (add-to-list var val)))))) + (when entry + (let ((var (nth 1 entry)) + (val (nth 2 entry))) + (if (not (nth 3 entry)) (org-set-local var val) + (unless (listp (symbol-value var)) + (org-set-local var nil)) + (add-to-list var val))))))) ;; TODO keywords. (org-set-local 'org-todo-kwd-alist nil) (org-set-local 'org-todo-key-alist nil)