Commit 33e97a28 authored by Karl Fogel's avatar Karl Fogel

* lisp/bookmark.el (bookmark-delete): Don't let batch arg prevent saving.

  (bookmark-bmenu-execute-deletions): Don't save here, as bookmark-delete
  will now do so if necessary.

Suggested by: Thierry Volpiatto <thierry.volpiatto {_AT_} gmail.com>
(Bug#4348)
parent 9656d87b
2009-10-09 Karl Fogel <kfogel@red-bean.com>
* lisp/bookmark.el (bookmark-delete): Don't let batch arg prevent
saving.
(bookmark-bmenu-execute-deletions): Don't save here, as
bookmark-delete will now do so if necessary.
Suggested by: Thierry Volpiatto <thierry.volpiatto {_AT_} gmail.com>
(Bug#4348)
2009-10-09 Glenn Morris <rgm@gnu.org> 2009-10-09 Glenn Morris <rgm@gnu.org>
* mail/emacsbug.el (report-emacs-bug): Also print `features'. * mail/emacsbug.el (report-emacs-bug): Also print `features'.
......
...@@ -1261,14 +1261,12 @@ probably because we were called from there." ...@@ -1261,14 +1261,12 @@ probably because we were called from there."
;; occurrence has been deleted ;; occurrence has been deleted
(or (bookmark-get-bookmark bookmark-current-bookmark 'noerror) (or (bookmark-get-bookmark bookmark-current-bookmark 'noerror)
(setq bookmark-current-bookmark nil))) (setq bookmark-current-bookmark nil)))
;; Don't rebuild the list (unless batch
(if batch (bookmark-bmenu-surreptitiously-rebuild-list))
nil (setq bookmark-alist-modification-count
(bookmark-bmenu-surreptitiously-rebuild-list) (1+ bookmark-alist-modification-count))
(setq bookmark-alist-modification-count (when (bookmark-time-to-save-p)
(1+ bookmark-alist-modification-count)) (bookmark-save)))
(if (bookmark-time-to-save-p)
(bookmark-save))))
(defun bookmark-time-to-save-p (&optional final-time) (defun bookmark-time-to-save-p (&optional final-time)
...@@ -2018,10 +2016,6 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\ ...@@ -2018,10 +2016,6 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
(forward-char o-col)) (forward-char o-col))
(goto-char o-point)) (goto-char o-point))
(beginning-of-line) (beginning-of-line)
(setq bookmark-alist-modification-count
(1+ bookmark-alist-modification-count))
(if (bookmark-time-to-save-p)
(bookmark-save))
(message "Deleting bookmarks...done") (message "Deleting bookmarks...done")
)) ))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment