diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2011-03-23 21:02:38 +0100 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2011-03-23 21:02:38 +0100 |
commit | d9c5b384f881378e3ca75e81e8432ba918470150 (patch) | |
tree | c0978c44123f88b893dd117f00795b050e881001 | |
parent | 432e1256bc334d33bea85e536cc37677f6ef9edf (diff) | |
download | org-mode-d9c5b384f881378e3ca75e81e8432ba918470150.tar.gz |
org-list: org-keyword-time-regexp might be nil in other major modes
* lisp/org-list.el (org-toggle-checkbox): build value of
org-keyword-time-regexp instead of using it directly, as it's
buffer-local, and function might be called outside Org.
-rw-r--r-- | lisp/org-list.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el index 7136e2b..7787706 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -81,14 +81,15 @@ (require 'org-macs) (require 'org-compat) +(defvar org-M-RET-may-split-line) (defvar org-blank-before-new-entry) -(defvar org-complex-heading-regexp) +(defvar org-clock-string) +(defvar org-closed-string) +(defvar org-deadline-string) (defvar org-description-max-indent) -(defvar org-drawer-regexp) (defvar org-drawers) -(defvar org-M-RET-may-split-line) (defvar org-odd-levels-only) -(defvar org-outline-regexp) +(defvar org-scheduled-string) (defvar org-ts-regexp) (defvar org-ts-regexp-both) @@ -2076,7 +2077,11 @@ in subtree, ignoring drawers." (drawer-re (concat "^[ \t]*:\\(" (mapconcat 'regexp-quote org-drawers "\\|") "\\):[ \t]*$")) - (keyword-re (concat "^[ \t]*" org-keyword-time-regexp)) + (keyword-re (concat "^[ \t]*\\<\\(" org-scheduled-string + "\\|" org-deadline-string + "\\|" org-closed-string + "\\|" org-clock-string "\\)" + " *[[<]\\([^]>]+\\)[]>]")) (orderedp (org-entry-get nil "ORDERED")) (bounds ;; In a region, start at first item in region |