summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-07-28 18:08:44 +0200
committerBastien Guerry <bzg@altern.org>2014-07-28 18:08:44 +0200
commit7f21cfc65802d30b2de19899c6e193eba9b83e3f (patch)
treea8c42e633a1a6ff09b9f4fdc69c7192eff0a4969
parent63160e9aabf52a6814f0b33e0bfc9f8861d03dc8 (diff)
parent1387694888facf7a47304bfe272e95544086221c (diff)
downloadorg-mode-7f21cfc65802d30b2de19899c6e193eba9b83e3f.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-capture.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index cbdf6f7..9e33d25 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1533,8 +1533,8 @@ The template may still contain \"%?\" for cursor positioning."
(v-x (or (org-get-x-clipboard 'PRIMARY)
(org-get-x-clipboard 'CLIPBOARD)
(org-get-x-clipboard 'SECONDARY)))
- (v-t (format-time-string (car org-time-stamp-formats) ct))
- (v-T (format-time-string (cdr org-time-stamp-formats) ct))
+ (v-t (format-time-string (car org-time-stamp-formats) ct1))
+ (v-T (format-time-string (cdr org-time-stamp-formats) ct1))
(v-u (concat "[" (substring v-t 1 -1) "]"))
(v-U (concat "[" (substring v-T 1 -1) "]"))
;; `initial' and `annotation' might habe been passed.