From 8d59e10a06fcab175bc6978e79f62024cf654866 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 12 Aug 2009 18:38:07 +0200 Subject: [PATCH] Bugfix: Keep todo keyword list valid An entry `#+TODO:' without content make `M-x org-mode' fail. While it may cause problems to have no TODO keywords defined, this should not make entering the mode fail. --- lisp/ChangeLog | 3 +++ lisp/org.el | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9e4001216..1f3be38d5 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-08-12 Carsten Dominik + * org.el (org-set-regexps-and-options): Make sure the list of done + keywords is not invalid. + * org-exp.el (org-export-interpolate-newlines): New function. 2009-08-11 Carsten Dominik diff --git a/lisp/org.el b/lisp/org.el index 6a37acd2d..ceacb18fd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -3697,7 +3697,8 @@ means to push this value onto the list in the variable.") ;; Compute the regular expressions and other local variables (if (not org-done-keywords) - (setq org-done-keywords (list (org-last org-todo-keywords-1)))) + (setq org-done-keywords (and org-todo-keywords-1 + (list (org-last org-todo-keywords-1))))) (setq org-ds-keyword-length (+ 2 (max (length org-deadline-string) (length org-scheduled-string) (length org-clock-string)