summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-05-15 16:28:30 +0200
committerBastien Guerry <bzg@altern.org>2013-05-15 16:28:30 +0200
commitc5abc7e0ba03330ba10b030d6d351fb7cc0fb97a (patch)
treee3f17054555758c693409c32a5a636c4b399c7ec
parent0c31a4fcb6fb09e20f46d16da5ca0d24a52e6978 (diff)
downloadorg-mode-c5abc7e0ba03330ba10b030d6d351fb7cc0fb97a.tar.gz
org.el (org-set-regexps-and-options): Fix regexps
* org.el (org-set-regexps-and-options): Fix `org-deadline-time-hour-regexp' and `org-scheduled-time-hour-regexp'. Thanks to Nick Daly for reporting this.
-rw-r--r--lisp/org.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 3ea3cbd..03e6e5e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -126,6 +126,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
(declare-function org-table-edit-field "org-table" (arg))
(declare-function org-table-justify-field-maybe "org-table" (&optional new))
(declare-function org-table-set-constants "org-table" ())
+(declare-function org-table-calc-current-TBLFM "org-table" (&optional arg))
(declare-function org-id-get-create "org-id" (&optional force))
(declare-function org-id-find-id-file "org-id" (id))
(declare-function org-tags-view "org-agenda" (&optional todo-only match))
@@ -5101,7 +5102,7 @@ Support for group tags is controlled by the option
(concat "\\<" org-deadline-string " *<\\([^>]+\\)>")
org-deadline-time-hour-regexp
(concat "\\<" org-deadline-string
- " *<\\(.+[0-9]\\{1,2\\}:[0-9]\\{2\\}[^>]*\\)>")
+ " *<\\([^>]+[0-9]\\{1,2\\}:[0-9]\\{2\\}[0-9-+:hdwmy \t.]*\\)>")
org-deadline-line-regexp
(concat "\\<\\(" org-deadline-string "\\).*")
org-scheduled-regexp
@@ -5110,7 +5111,7 @@ Support for group tags is controlled by the option
(concat "\\<" org-scheduled-string " *<\\([^>]+\\)>")
org-scheduled-time-hour-regexp
(concat "\\<" org-scheduled-string
- " *<\\(.+[0-9]\\{1,2\\}:[0-9]\\{2\\}[^>]*\\)>")
+ " *<\\([^>]+[0-9]\\{1,2\\}:[0-9]\\{2\\}[0-9-+:hdwmy \t.]*\\)>")
org-closed-time-regexp
(concat "\\<" org-closed-string " *\\[\\([^]]+\\)\\]")
org-keyword-time-regexp