forked from mirrors/org-mode
Fix bug in org-schedule' and
org-deadline' introduced in fc8824.
Thanks to Eric Abrahamsen for reporting this.
This commit is contained in:
parent
f00fd7800f
commit
5c4c8afe07
|
@ -12632,7 +12632,7 @@ can either be an Org date like \"2011-07-24\" or a delta like \"+2d\"."
|
||||||
org-loop-over-headlines-in-active-region
|
org-loop-over-headlines-in-active-region
|
||||||
cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
|
cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
|
||||||
(let* ((old-date (org-entry-get nil "DEADLINE"))
|
(let* ((old-date (org-entry-get nil "DEADLINE"))
|
||||||
(old-date-time (org-time-string-to-time old-date))
|
(old-date-time (if old-date (org-time-string-to-time old-date)))
|
||||||
(repeater (and old-date
|
(repeater (and old-date
|
||||||
(string-match
|
(string-match
|
||||||
"\\([.+-]+[0-9]+[hdwmy]\\(?:[/ ][-+]?[0-9]+[hdwmy]\\)?\\) ?"
|
"\\([.+-]+[0-9]+[hdwmy]\\(?:[/ ][-+]?[0-9]+[hdwmy]\\)?\\) ?"
|
||||||
|
@ -12701,7 +12701,7 @@ either be an Org date like \"2011-07-24\" or a delta like \"+2d\"."
|
||||||
org-loop-over-headlines-in-active-region
|
org-loop-over-headlines-in-active-region
|
||||||
cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
|
cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
|
||||||
(let* ((old-date (org-entry-get nil "SCHEDULED"))
|
(let* ((old-date (org-entry-get nil "SCHEDULED"))
|
||||||
(old-date-time (org-time-string-to-time old-date))
|
(old-date-time (if old-date (org-time-string-to-time old-date)))
|
||||||
(repeater (and old-date
|
(repeater (and old-date
|
||||||
(string-match
|
(string-match
|
||||||
"\\([.+-]+[0-9]+[hdwmy]\\(?:[/ ][-+]?[0-9]+[hdwmy]\\)?\\) ?"
|
"\\([.+-]+[0-9]+[hdwmy]\\(?:[/ ][-+]?[0-9]+[hdwmy]\\)?\\) ?"
|
||||||
|
|
Loading…
Reference in a new issue