summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-04-02 15:00:59 -0700
committerKyle Meyer <kyle@kyleam.com>2019-04-02 19:04:56 -0400
commitb0324a74051c14848739bf3fe4a9ee01279e9068 (patch)
tree08c642f8ba1d9788abfaa4d78032ab2aecb63635
parentb913b7404b0e9ed183da8abf4af738e750c9f34c (diff)
downloadorg-mode-b0324a74051c14848739bf3fe4a9ee01279e9068.tar.gz
Backport commit f9ff60e0d from Emacs
* lisp/org-eshell.el (org-eshell-open): * lisp/org.el (org-deadline-time-hour-regexp) (org-scheduled-time-hour-regexp): Avoid attempts to chain ranges, as this can be confusing. For example, instead of [0-9-_.], use [0-9_.-]. Improve regexp advice again, and unchain ranges f9ff60e0d7288e30cdbd1e43225059f1374441f1 Paul Eggert Tue Apr 2 15:01:34 2019 -0700
-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