[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 91681fc033: Merge branch 'bugfix'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 91681fc033: Merge branch 'bugfix' |
Date: |
Wed, 2 Mar 2022 23:57:38 -0500 (EST) |
branch: externals/org
commit 91681fc03334285dc0879fcb9a27583bd7ab9782
Merge: ef66660cf4 668205f769
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'bugfix'
---
lisp/org-capture.el | 3 ++-
lisp/org-refile.el | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 5195b785e6..bbb37eb27a 100644
--- a/lisp/org-capture.el
+++ b/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)
diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 5dfffe7851..5ad73422ef 100644
--- a/lisp/org-refile.el
+++ b/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)))