[Emacs-diffs] emacs/lisp bookmark.el ChangeLog

[Karl Fogel]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Karl Fogel <kfogel>     09/10/09 06:44:43

Modified files:
        lisp           : bookmark.el ChangeLog 

Log message:
        * 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)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/bookmark.el?cvsroot=emacs&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16393&r2=1.16394

Patches:
Index: bookmark.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/bookmark.el,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- bookmark.el 9 Oct 2009 05:54:57 -0000       1.132
+++ bookmark.el 9 Oct 2009 06:44:40 -0000       1.133
@@ -1261,14 +1261,12 @@
     ;; occurrence has been deleted
     (or (bookmark-get-bookmark bookmark-current-bookmark 'noerror)
         (setq bookmark-current-bookmark nil)))
-  ;; Don't rebuild the list
-  (if batch
-      nil
-    (bookmark-bmenu-surreptitiously-rebuild-list)
+  (unless batch
+    (bookmark-bmenu-surreptitiously-rebuild-list))
     (setq bookmark-alist-modification-count
           (1+ bookmark-alist-modification-count))
-    (if (bookmark-time-to-save-p)
-        (bookmark-save))))
+  (when (bookmark-time-to-save-p)
+    (bookmark-save)))
 
 
 (defun bookmark-time-to-save-p (&optional final-time)
@@ -2018,10 +2016,6 @@
           (forward-char o-col))
       (goto-char o-point))
     (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")
     ))
 

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16393
retrieving revision 1.16394
diff -u -b -r1.16393 -r1.16394
--- ChangeLog   9 Oct 2009 06:29:56 -0000       1.16393
+++ ChangeLog   9 Oct 2009 06:44:41 -0000       1.16394
@@ -1,3 +1,12 @@
+2009-10-09  Karl Fogel  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/emacsbug.el (report-emacs-bug): Also print `features'.