Merge branch 'maint'

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")