summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2019-04-07 08:57:58 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2019-04-07 08:57:58 +0200
commit6ec402dc91e4d2af30a34e8b21178adf1348de30 (patch)
treee8d5d5447850302846880055e0f9ebd61bf6ea49
parent4ba6de43d48daf392410ba64b1380d7be4c11152 (diff)
parentb0324a74051c14848739bf3fe4a9ee01279e9068 (diff)
downloadorg-mode-6ec402dc91e4d2af30a34e8b21178adf1348de30.tar.gz
Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
-rw-r--r--lisp/org-eshell.el2
-rw-r--r--lisp/org.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-eshell.el b/lisp/org-eshell.el
index fa9aee5..be6db47 100644
--- a/lisp/org-eshell.el
+++ b/lisp/org-eshell.el
@@ -37,7 +37,7 @@
eshell buffer) or a command line prefixed by a buffer name
followed by a colon."
(let* ((buffer-and-command
- (if (string-match "\\([A-Za-z0-9-+*]+\\):\\(.*\\)" link)
+ (if (string-match "\\([A-Za-z0-9+*-]+\\):\\(.*\\)" link)
(list (match-string 1 link)
(match-string 2 link))
(list eshell-buffer-name link)))
diff --git a/lisp/org.el b/lisp/org.el
index f41a73a..5f74603 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -458,7 +458,7 @@ Matched keyword is in group 1.")
(defconst org-deadline-time-hour-regexp
(concat "\\<" org-deadline-string
- " *<\\([^>]+[0-9]\\{1,2\\}:[0-9]\\{2\\}[0-9-+:hdwmy \t.]*\\)>")
+ " *<\\([^>]+[0-9]\\{1,2\\}:[0-9]\\{2\\}[0-9+:hdwmy \t.-]*\\)>")
"Matches the DEADLINE keyword together with a time-and-hour stamp.")
(defconst org-deadline-line-regexp
@@ -474,7 +474,7 @@ Matched keyword is in group 1.")
(defconst org-scheduled-time-hour-regexp
(concat "\\<" org-scheduled-string
- " *<\\([^>]+[0-9]\\{1,2\\}:[0-9]\\{2\\}[0-9-+:hdwmy \t.]*\\)>")
+ " *<\\([^>]+[0-9]\\{1,2\\}:[0-9]\\{2\\}[0-9+:hdwmy \t.-]*\\)>")
"Matches the SCHEDULED keyword together with a time-and-hour stamp.")
(defconst org-closed-time-regexp