summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-23 08:30:33 (GMT)
committer Nicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-23 08:30:33 (GMT)
commitb47de2506292b42b98143f1eb38d6d17fdc6f56d (patch)
treef5194a3541756b989dbbcc6b4176808151090f25
parentd58837a5eaf19724065d0ce5a057ebc5216e8435 (diff)
parent2ff3101c0e555627421162a759c4342f0b923a34 (diff)
downloadorg-mode-master.zip
org-mode-master.tar.gz
Merge branch 'maint'HEADmaster
-rw-r--r--lisp/org-capture.el15
1 files changed, 11 insertions, 4 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 627522a..c72dd06 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1782,24 +1782,31 @@ The template may still contain \"%?\" for cursor positioning."
(_ (error "Invalid `org-capture--clipboards' value: %S"
org-capture--clipboards)))))
("p" (org-set-property prompt nil))
- ((guard key)
+ ((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)))
+ (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))))
- (_
+ (`nil
(push (org-completing-read
(concat (or prompt "Enter string")
(and default (format " [%s]" default))
": ")
completions nil nil nil nil default)
strings)
- (insert (car strings)))))))))
+ (insert (car strings)))
+ (_
+ (error "Unknown template placeholder: \"%%^%s\""
+ key))))))))
;; Replace %n escapes with nth %^{...} string.
(setq strings (nreverse strings))