diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-11-01 12:02:47 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-11-01 12:07:14 +0100 |
| commit | 82de7dafa31da88ac14d63920b4deca384ad1617 (patch) | |
| tree | ed28527b63e01af0f5c670d96e796d79936f4a74 | |
| parent | 17d014ec65ed4fcba82ee01d9942463496eaea1b (diff) | |
| download | org-mode-82de7dafa31da88ac14d63920b4deca384ad1617.tar.gz | |
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 <mike.mclean@pobox.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/92279>
| -rwxr-xr-x | lisp/org.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/org.el b/lisp/org.el index 5b2082e..84b0786 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) |