ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-19 16:09:13 +02:00
parent 3733658bb5 f4d76465be
commit ad685348fd
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/org.el
View File

@ -13338,10 +13338,11 @@ can either be an Org date like \"2011-07-24\" or a delta like \"+2d\"."
(user-error "No deadline information to update"))))
(t
(org-add-planning-info 'deadline time 'closed)
(when (and old-date org-log-redeadline
(not (equal old-date
(substring org-last-inserted-timestamp 1 -1))))
(org-add-log-setup 'redeadline nil old-date 'findpos
(when (and old-date
org-log-redeadline
(not (equal old-date org-last-inserted-timestamp)))
(org-add-log-setup
'redeadline org-last-inserted-timestamp nil old-date 'findpos
org-log-redeadline))
(when repeater
(save-excursion
@ -13409,10 +13410,11 @@ either be an Org date like \"2011-07-24\" or a delta like \"+2d\"."
(user-error "No scheduled information to update"))))
(t
(org-add-planning-info 'scheduled time 'closed)
(when (and old-date org-log-reschedule
(not (equal old-date
(substring org-last-inserted-timestamp 1 -1))))
(org-add-log-setup 'reschedule nil old-date 'findpos
(when (and old-date
org-log-reschedule
(not (equal old-date org-last-inserted-timestamp)))
(org-add-log-setup
'reschedule org-last-inserted-timestamp nil old-date 'findpos
org-log-reschedule))
(when repeater
(save-excursion