tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Enforce white space after todo keywords 

* lisp/org.el (org-set-regexps-and-options): enforce white space after
  todo keyword, as word boundary isn't sufficient (i.e. in matches * TODO/this)
This commit is contained in:
Nicolas Goaziou 2011-07-25 17:50:28 +02:00
parent 395a816a18
commit 628ebf04f7
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lisp/org.el
View File

@ -4537,38 +4537,40 @@ means to push this value onto the list in the variable.")
org-not-done-heading-regexp org-not-done-heading-regexp
(concat "^\\(\\*+\\)[ \t]+\\(" (concat "^\\(\\*+\\)[ \t]+\\("
(mapconcat 'regexp-quote org-not-done-keywords "\\|") (mapconcat 'regexp-quote org-not-done-keywords "\\|")
"\\)\\>") "\\)[ \t]+")
org-todo-line-regexp org-todo-line-regexp
(concat "^\\(\\*+\\)[ \t]+\\(?:\\(" (concat "^\\(\\*+\\)[ \t]+\\(?:\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|") (mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
"\\)\\>\\)?[ \t]*\\(.*\\)") "\\)[ \t]+\\)?\\(.*\\)")
org-complex-heading-regexp org-complex-heading-regexp
(concat "^\\(\\*+\\)[ \t]+\\(?:\\(" (concat "^\\(\\*+\\)[ \t]+\\(?:\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|") (mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
"\\)\\>\\)?\\(?:[ \t]*\\(\\[#.\\]\\)\\)?[ \t]*\\(.*?\\)" "\\)[ \t]+\\)?"
"\\(?:\\(\\[#.\\]\\)[ \t]+\\)?"
"\\(.*?\\)"
"\\(?:[ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)?[ \t]*$") "\\(?:[ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)?[ \t]*$")
org-complex-heading-regexp-format org-complex-heading-regexp-format
(concat "^\\(\\*+\\)[ \t]+\\(?:\\(" (concat "^\\(\\*+\\)[ \t]+\\(?:\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|") (mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
"\\)\\>\\)?" "\\)[ \t]+\\)?"
"\\(?:[ \t]*\\(\\[#.\\]\\)\\)?" "\\(?:\\(\\[#.\\]\\)[ \t]+\\)?"
"\\(?:[ \t]*\\(?:\\[[0-9%%/]+\\]\\)\\)?" ;; stats cookie "\\(?:\\(?:\\[[0-9%%/]+\\]\\)[ \t]+\\)?" ; stats cookie
"[ \t]*\\(%s\\)" "\\(%s\\)[ \t]*"
"\\(?:[ \t]*\\(?:\\[[0-9%%/]+\\]\\)\\)?" ;; stats cookie "\\(?:\\[[0-9%%/]+\\]\\)?" ; stats cookie
"\\(?:[ \t]+\\(:[[:alnum:]_@#%%:]+:\\)\\)?[ \t]*$") (org-re "\\(?:[ \t]+\\(:[[:alnum:]_@#%%:]+:\\)\\)?[ \t]*$"))
org-nl-done-regexp org-nl-done-regexp
(concat "\n\\*+[ \t]+" (concat "\n\\*+[ \t]+"
"\\(?:" (mapconcat 'regexp-quote org-done-keywords "\\|") "\\(?:" (mapconcat 'regexp-quote org-done-keywords "\\|")
"\\)" "\\>") "\\)" "[ \t]+")
org-todo-line-tags-regexp org-todo-line-tags-regexp
(concat "^\\(\\*+\\)[ \t]+\\(?:\\(" (concat "^\\(\\*+\\)[ \t]+\\(?:\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|") (mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
(org-re "\\)[ \t]+\\)"
"\\)\\>\\)? *\\(.*?\\([ \t]:[[:alnum:]:_@#%]+:[ \t]*\\)?$\\)")) (org-re "\\(.*?\\([ \t]:[[:alnum:]:_@#%]+:[ \t]*\\)?$\\)"))
org-looking-at-done-regexp org-looking-at-done-regexp
(concat "^" "\\(?:" (concat "^" "\\(?:"
(mapconcat 'regexp-quote org-done-keywords "\\|") "\\)" (mapconcat 'regexp-quote org-done-keywords "\\|") "\\)"
"\\>") "[ \t]+")
org-deadline-regexp (concat "\\<" org-deadline-string) org-deadline-regexp (concat "\\<" org-deadline-string)
org-deadline-time-regexp org-deadline-time-regexp
(concat "\\<" org-deadline-string " *<\\([^>]+\\)>") (concat "\\<" org-deadline-string " *<\\([^>]+\\)>")