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

Run `bookmark-set' within `with-demoted-errors'. 

* org.el (org-refile): Run within `with-demoted-errors' so
that a corrupted bookmark file does not stop the refile
process.

* org-capture.el (org-capture-bookmark-last-stored-position):
Ditto for the capture process.

Note: we do not prevent such errors in org-remember.el as this
libary will be obsoleted for the next major release of Org.
This commit is contained in:
Bastien Guerry 2012-10-26 14:55:08 +02:00
parent 3cd0c14d34
commit 116c09053f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-capture.el
View File

@ -1250,7 +1250,8 @@ Of course, if exact position has been required, just put it there."
(save-restriction (save-restriction
(widen) (widen)
(goto-char pos) (goto-char pos)
(bookmark-set "org-capture-last-stored") (with-demoted-errors
(bookmark-set "org-capture-last-stored"))
(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)

6
lisp/org.el
View File

@ -10876,11 +10876,13 @@ prefix argument (`C-u C-u C-u C-c C-w')."
(and org-auto-align-tags (and org-auto-align-tags
(let ((org-loop-over-headlines-in-active-region nil)) (let ((org-loop-over-headlines-in-active-region nil))
(org-set-tags nil t))) (org-set-tags nil t)))
(bookmark-set "org-refile-last-stored") (with-demoted-errors
(bookmark-set "org-refile-last-stored"))
;; 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 (org-bound-and-true-p org-refile-for-capture) (when (org-bound-and-true-p org-refile-for-capture)
(bookmark-set "org-capture-last-stored-marker") (with-demoted-errors
(bookmark-set "org-capture-last-stored-marker"))
(move-marker org-capture-last-stored-marker (point))) (move-marker org-capture-last-stored-marker (point)))
(if (fboundp 'deactivate-mark) (deactivate-mark)) (if (fboundp 'deactivate-mark) (deactivate-mark))
(run-hooks 'org-after-refile-insert-hook)))) (run-hooks 'org-after-refile-insert-hook))))