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 2018-03-01 10:56:01 +01:00
parent 09af7f18b2 428ab7942a
commit a1659053d5
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lisp/org-agenda.el
View File

@ -9925,32 +9925,33 @@ The prefix arg is passed through to the command if possible."
(org-agenda-set-tags ,tag
,(if (eq action ?+) ''on ''off))))))
(?s
(let ((time
((and (or ?s ?d) c)
(let* ((schedule? (eq c ?s))
(prompt (if schedule? "(Re)Schedule to" "(Re)Set Deadline to"))
(time
(and (not arg)
(org-read-date nil nil nil "(Re)Schedule to"
org-overriding-default-time))))
(let ((new (org-read-date
nil nil nil prompt org-overriding-default-time)))
;; A "double plus" answer applies to every
;; scheduled time. Do not turn it into
;; a fixed date yet.
(if (string-match-p "\\`[ \t]*\\+\\+"
org-read-date-final-answer)
org-read-date-final-answer
new)))))
;; Make sure to not prompt for a note when bulk
;; rescheduling as Org cannot cope with simultaneous notes.
;; Besides, it could be annoying depending on the number of
;; items re-scheduled.
;; rescheduling/resetting deadline as Org cannot cope with
;; simultaneous notes. Besides, it could be annoying
;; depending on the number of marked items.
(setq cmd
(if schedule?
`(lambda ()
(let ((org-log-reschedule (and org-log-reschedule 'time)))
(org-agenda-schedule arg ,time))))))
(?d
(let ((time
(and (not arg)
(org-read-date nil nil nil "(Re)Set Deadline to"
org-overriding-default-time))))
;; Make sure to not prompt for a note when bulk
;; rescheduling as Org cannot cope with simultaneous
;; notes. Besides, it could be annoying depending on the
;; number of items re-scheduled.
(setq cmd
(let ((org-log-reschedule
(and org-log-reschedule 'time)))
(org-agenda-schedule arg ,time)))
`(lambda ()
(let ((org-log-redeadline (and org-log-redeadline 'time)))
(org-agenda-deadline arg ,time))))))
(org-agenda-deadline arg ,time)))))))
(?S
(unless (org-agenda-check-type nil 'agenda 'todo)