ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix'

This commit is contained in:
Kyle Meyer 2022-03-02 23:04:59 -05:00
parent ef66660cf4 668205f769
commit 91681fc033
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-capture.el
View File

@ -1453,7 +1453,8 @@ Of course, if exact position has been required, just put it there."
(org-with-point-at pos (org-with-point-at pos
(when org-capture-bookmark (when org-capture-bookmark
(let ((bookmark (plist-get org-bookmark-names-plist :last-capture))) (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)))))) (move-marker org-capture-last-stored-marker (point))))))
(defun org-capture-narrow (beg end) (defun org-capture-narrow (beg end)

8
lisp/org-refile.el
View File

@ -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 (let ((bookmark-name (plist-get org-bookmark-names-plist
:last-refile))) :last-refile)))
(when bookmark-name (when bookmark-name
(with-demoted-errors (with-demoted-errors "Bookmark set error: %S"
(bookmark-set bookmark-name)))) (bookmark-set bookmark-name))))
;; If we are refiling for capture, make sure that the ;; If we are refiling for capture, make sure that the
;; last-capture pointers point here ;; last-capture pointers point here
(when (bound-and-true-p org-capture-is-refiling) (when (bound-and-true-p org-capture-is-refiling)
(let ((bookmark-name (plist-get org-bookmark-names-plist (let ((bookmark-name (plist-get org-bookmark-names-plist
:last-capture-marker))) :last-capture-marker)))
(when bookmark-name (when bookmark-name
(with-demoted-errors (with-demoted-errors "Bookmark set error: %S"
(bookmark-set bookmark-name)))) (bookmark-set bookmark-name))))
(move-marker org-capture-last-stored-marker (point))) (move-marker org-capture-last-stored-marker (point)))
(when (fboundp 'deactivate-mark) (deactivate-mark)) (when (fboundp 'deactivate-mark) (deactivate-mark))
(run-hooks 'org-after-refile-insert-hook))) (run-hooks 'org-after-refile-insert-hook)))