Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2018-05-16 22:07:33 +02:00
commit 463664bdd0
1 changed files with 2 additions and 2 deletions

View File

@ -13192,8 +13192,8 @@ EXTRA is additional text that will be inserted into the notes buffer."
(regexp-quote (cdr (assq 'state org-log-note-headings)))
`(("%d" . ,org-ts-regexp-inactive)
("%D" . ,org-ts-regexp)
("%s" . "\"\\S-+\"")
("%S" . "\"\\S-+\"")
("%s" . "\\(?:\"\\S-+\"\\)?")
("%S" . "\\(?:\"\\S-+\"\\)?")
("%t" . ,org-ts-regexp-inactive)
("%T" . ,org-ts-regexp)
("%u" . ".*?")