Merge branch 'maint'

lisp/org-capture.el

@@ -831,9 +831,7 @@ for `entry'-type templates"))
     ;; empty lines) around entry, use a marker to refer to the
     ;; headline to be refiled.  Place the marker in the base buffer,
     ;; as the current indirect one is going to be killed.
-    (set-marker pos (save-excursion
-		      (and (org-back-to-heading t) (point)))
-		base)
+    (set-marker pos (save-excursion (org-back-to-heading t) (point)) base)
     (org-capture-put :kill-buffer nil)
     (unwind-protect
 	(progn