mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-19 09:48:42 +00:00
Fixed bug related to repeating time stamps.
There was a problem that due dates in the past would not be advanced property (reported by Wanrong Lin)
This commit is contained in:
parent
2b3fe71634
commit
9a44493492
|
@ -1,5 +1,9 @@
|
||||||
2008-03-28 Carsten Dominik <dominik@science.uva.nl>
|
2008-03-28 Carsten Dominik <dominik@science.uva.nl>
|
||||||
|
|
||||||
|
* lisp/org.el (org-auto-repeat-maybe): Make sure that repeating
|
||||||
|
dates are pushed into the future, and that the shift is at least
|
||||||
|
one interval, never 0.
|
||||||
|
|
||||||
* lisp/org-agenda.el (org-agenda-deadline-leaders): Allow a
|
* lisp/org-agenda.el (org-agenda-deadline-leaders): Allow a
|
||||||
function value for the deadline leader.
|
function value for the deadline leader.
|
||||||
(org-agenda-get-deadlines): Deal with new function value.
|
(org-agenda-get-deadlines): Deal with new function value.
|
||||||
|
|
|
@ -8706,12 +8706,12 @@ This function is run automatically after each state change to a DONE state."
|
||||||
(- (time-to-days (current-time)) (time-to-days time))
|
(- (time-to-days (current-time)) (time-to-days time))
|
||||||
'day))
|
'day))
|
||||||
((equal (match-string 1 ts) "+")
|
((equal (match-string 1 ts) "+")
|
||||||
(while (< (time-to-days time) (time-to-days (current-time)))
|
(while (or (= nshift 0)
|
||||||
|
(<= (time-to-days time) (time-to-days (current-time))))
|
||||||
(when (= (incf nshift) nshiftmax)
|
(when (= (incf nshift) nshiftmax)
|
||||||
(or (y-or-n-p (message "%d repeater intervals were not enough to shift date past today. Continue? " nshift))
|
(or (y-or-n-p (message "%d repeater intervals were not enough to shift date past today. Continue? " nshift))
|
||||||
(error "Abort")))
|
(error "Abort")))
|
||||||
(org-timestamp-change n (cdr (assoc what whata)))
|
(org-timestamp-change n (cdr (assoc what whata)))
|
||||||
(sit-for .0001) ;; so we can watch the date shifting
|
|
||||||
(org-at-timestamp-p t)
|
(org-at-timestamp-p t)
|
||||||
(setq ts (match-string 1))
|
(setq ts (match-string 1))
|
||||||
(setq time (save-match-data (org-time-string-to-time ts))))
|
(setq time (save-match-data (org-time-string-to-time ts))))
|
||||||
|
|
Loading…
Reference in a new issue