diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-08-25 21:51:56 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-08-25 21:51:56 +0200 |
commit | 489346c1d528256cf4bf21dbfa4a140e720e7d1d (patch) | |
tree | 7814434b66c8694da0186d2cc2b55cf5f6908705 | |
parent | a68d117459c9681dcf8e7df6ebebd6e37fd3dbc2 (diff) | |
parent | 51b431d01365211d4c40b07729d5d11d82b9dfe2 (diff) | |
download | org-mode-489346c1d528256cf4bf21dbfa4a140e720e7d1d.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-capture.el | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el index c72dd06..7547c1a 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1785,17 +1785,13 @@ The template may still contain \"%?\" for cursor positioning." ((or "t" "T" "u" "U") ;; These are the date/time related ones. (let* ((upcase? (equal (upcase key) key)) - (org-time-was-given upcase?) - (org-end-time-was-given) - (time - (org-read-date - upcase? t nil prompt nil - (pcase key - ("t" v-t) ("T" v-T) ("u" v-u) ("U" v-U))))) - (org-insert-time-stamp - time org-time-was-given - (member key '("u" "U")) - nil nil (list org-end-time-was-given)))) + (org-end-time-was-given nil) + (time (org-read-date upcase? t nil prompt))) + (let ((org-time-was-given upcase?)) + (org-insert-time-stamp + time org-time-was-given + (member key '("u" "U")) + nil nil (list org-end-time-was-given))))) (`nil (push (org-completing-read (concat (or prompt "Enter string") |