summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-25 21:51:04 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-25 21:51:04 +0200
commit51b431d01365211d4c40b07729d5d11d82b9dfe2 (patch)
treeb12154145679f57c1ecb261ae6c02530d49ea6bc
parentc1b9d38c892f389275e9cf6fb5a5aa12ee981bc7 (diff)
downloadorg-mode-51b431d01365211d4c40b07729d5d11d82b9dfe2.tar.gz
org-capture: Fix "org-capture: Fix %^T and %^U placeholders"
* lisp/org-capture.el (org-capture-fill-template): Fix 2ff3101c0e555627421162a759c4342f0b923a34.
-rw-r--r--lisp/org-capture.el18
1 files changed, 7 insertions, 11 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index deb33c8..4320730 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1754,17 +1754,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")