From 116c09053faaf603cf8541d5776abfb1247d9de3 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 26 Oct 2012 14:55:08 +0200 Subject: [PATCH] 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. --- lisp/org-capture.el | 3 ++- lisp/org.el | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index be973b0ad..1dfffc6fe 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1250,7 +1250,8 @@ Of course, if exact position has been required, just put it there." (save-restriction (widen) (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))))))) (defun org-capture-narrow (beg end) diff --git a/lisp/org.el b/lisp/org.el index bdbba8611..45dbe2754 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -10876,11 +10876,13 @@ prefix argument (`C-u C-u C-u C-c C-w')." (and org-auto-align-tags (let ((org-loop-over-headlines-in-active-region nil)) (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 ;; last-capture pointers point here (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))) (if (fboundp 'deactivate-mark) (deactivate-mark)) (run-hooks 'org-after-refile-insert-hook)))) -- 2.11.4.GIT