Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-23 22:46:29 +02:00
commit 4f8d40dc33
1 changed files with 1 additions and 1 deletions

View File

@ -6392,7 +6392,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
'(org-activate-code (1 'org-code t))
;; COMMENT
(list (format
"^\\*\\(?: +%s\\)?\\(?: +\\[#[A-Z0-9]\\]\\)? +\\(?9:%s\\)\\(?: \\|$\\)"
"^\\*+\\(?: +%s\\)?\\(?: +\\[#[A-Z0-9]\\]\\)? +\\(?9:%s\\)\\(?: \\|$\\)"
org-todo-regexp
org-comment-string)
'(9 'org-special-keyword t))