mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-27 07:37:25 +00:00
Code

Merge branch 'maint'

Browse Source
This commit is contained in:
Bastien Guerry 2012-09-12 09:48:33 +02:00
commit d815ca4fb2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/org-agenda.el
View File

@ -8960,20 +8960,22 @@ The prefix arg is passed through to the command if possible."
(setq cmd `(org-agenda-set-tags ,tag ,(if (eq action ?+) ''on ''off))))
((memq action '(?s ?d))
(let* ((date (unless arg
(or org-overriding-default-time
(org-read-date
(let* ((date
(unless arg
(or org-overriding-default-time
(and (org-read-date
nil nil nil
(if (eq action ?s) "(Re)Schedule to" "(Re)Set Deadline to")
nil (format-time-string (car org-time-stamp-formats)
(org-get-cursor-date))))))
(ans (if arg nil org-read-date-final-answer))
(if (eq action ?s) "(Re)Schedule to" "(Re)Set Deadline to"))
(or (ignore-errors
(org-time-string-to-time org-read-date-final-answer))
(current-time))))))
(date (format-time-string (car org-time-stamp-formats) date))
(c1 (if (eq action ?s) 'org-agenda-schedule 'org-agenda-deadline)))
(setq cmd `(let* ((bound (fboundp 'read-string))
(old (and bound (symbol-function 'read-string))))
(unwind-protect
(progn
(fset 'read-string (lambda (&rest ignore) ,ans))
(fset 'read-string (lambda (&rest ignore) ,date))
(eval '(,c1 arg)))
(if bound
(fset 'read-string old)