Merge branch 'bugfix'

lisp/org-capture.el

@@ -1453,7 +1453,8 @@ Of course, if exact position has been required, just put it there."
       (org-with-point-at pos
 	(when org-capture-bookmark
 	  (let ((bookmark (plist-get org-bookmark-names-plist :last-capture)))
-	    (when bookmark (with-demoted-errors (bookmark-set bookmark)))))
+	    (when bookmark (with-demoted-errors "Bookmark set error: %S"
+	                     (bookmark-set bookmark)))))
 	(move-marker org-capture-last-stored-marker (point))))))
 
 (defun org-capture-narrow (beg end)

lisp/org-refile.el

@@ -566,16 +566,16 @@ prefix argument (`C-u C-u C-u C-c C-w')."
 	       (let ((bookmark-name (plist-get org-bookmark-names-plist
 					       :last-refile)))
 		 (when bookmark-name
-		   (with-demoted-errors
-		       (bookmark-set bookmark-name))))
+		   (with-demoted-errors "Bookmark set error: %S"
+		     (bookmark-set bookmark-name))))
 	       ;; If we are refiling for capture, make sure that the
 	       ;; last-capture pointers point here
 	       (when (bound-and-true-p org-capture-is-refiling)
 		 (let ((bookmark-name (plist-get org-bookmark-names-plist
 						 :last-capture-marker)))
 		   (when bookmark-name
-		     (with-demoted-errors
-			 (bookmark-set bookmark-name))))
+		     (with-demoted-errors "Bookmark set error: %S"
+		       (bookmark-set bookmark-name))))
 		 (move-marker org-capture-last-stored-marker (point)))
 	       (when (fboundp 'deactivate-mark) (deactivate-mark))
 	       (run-hooks 'org-after-refile-insert-hook)))