|
@@ -4724,7 +4724,7 @@ means to push this value onto the list in the variable.")
|
|
"\\|" org-deadline-string
|
|
"\\|" org-deadline-string
|
|
"\\|" org-closed-string
|
|
"\\|" org-closed-string
|
|
"\\|" org-clock-string "\\)\\)?"
|
|
"\\|" org-clock-string "\\)\\)?"
|
|
- " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [^]\r\n>]*?[]>]\\|<%%([^\r\n>]*>\\)")
|
|
|
|
|
|
+ " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?[]>]\\|<%%([^\r\n>]*>\\)")
|
|
org-planning-or-clock-line-re
|
|
org-planning-or-clock-line-re
|
|
(concat "\\(?:^[ \t]*\\(" org-scheduled-string
|
|
(concat "\\(?:^[ \t]*\\(" org-scheduled-string
|
|
"\\|" org-deadline-string
|
|
"\\|" org-deadline-string
|
|
@@ -5189,15 +5189,15 @@ This should be called after the variable `org-link-types' has changed."
|
|
|
|
|
|
(org-make-link-regexps)
|
|
(org-make-link-regexps)
|
|
|
|
|
|
-(defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [^\r\n>]*?\\)>"
|
|
|
|
|
|
+(defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^\r\n>]*?\\)>"
|
|
"Regular expression for fast time stamp matching.")
|
|
"Regular expression for fast time stamp matching.")
|
|
-(defconst org-ts-regexp-both "[[<]\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [^]\r\n>]*?\\)[]>]"
|
|
|
|
|
|
+(defconst org-ts-regexp-both "[[<]\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?\\)[]>]"
|
|
"Regular expression for fast time stamp matching.")
|
|
"Regular expression for fast time stamp matching.")
|
|
(defconst org-ts-regexp0 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\) *\\([^]+0-9>\r\n -]*\\)\\( \\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
|
|
(defconst org-ts-regexp0 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\) *\\([^]+0-9>\r\n -]*\\)\\( \\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
|
|
"Regular expression matching time strings for analysis.
|
|
"Regular expression matching time strings for analysis.
|
|
This one does not require the space after the date, so it can be used
|
|
This one does not require the space after the date, so it can be used
|
|
on a string that terminates immediately after the date.")
|
|
on a string that terminates immediately after the date.")
|
|
-(defconst org-ts-regexp1 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\) +\\([^]+0-9>\r\n -]*\\)\\( \\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
|
|
|
|
|
|
+(defconst org-ts-regexp1 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\) *\\([^]+0-9>\r\n -]*\\)\\( \\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
|
|
"Regular expression matching time strings for analysis.")
|
|
"Regular expression matching time strings for analysis.")
|
|
(defconst org-ts-regexp2 (concat "<" org-ts-regexp1 "[^>\n]\\{0,16\\}>")
|
|
(defconst org-ts-regexp2 (concat "<" org-ts-regexp1 "[^>\n]\\{0,16\\}>")
|
|
"Regular expression matching time stamps, with groups.")
|
|
"Regular expression matching time stamps, with groups.")
|
|
@@ -18236,6 +18236,8 @@ This command does many different things, depending on context:
|
|
(fboundp org-finish-function))
|
|
(fboundp org-finish-function))
|
|
(funcall org-finish-function))
|
|
(funcall org-finish-function))
|
|
((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook))
|
|
((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook))
|
|
|
|
+ ((org-in-regexp org-ts-regexp-both)
|
|
|
|
+ (org-timestamp-change 0 'day))
|
|
((or (looking-at org-property-start-re)
|
|
((or (looking-at org-property-start-re)
|
|
(org-at-property-p))
|
|
(org-at-property-p))
|
|
(call-interactively 'org-property-action))
|
|
(call-interactively 'org-property-action))
|