[Emacs-diffs] /srv/bzr/emacs/trunk r112217: * lisp/bookmark.el: Fix deletion of bookmarks.

[Stefan Monnier]

------------------------------------------------------------
revno: 112217
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13972
author: Thierry Volpiatto <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-04-03 21:59:09 -0400
message:
  * lisp/bookmark.el: Fix deletion of bookmarks.
  (bookmark-bmenu-list): Don't toggle filenames if alist is empty.
  (bookmark-bmenu-execute-deletions): Only skip first line if it's
  the header.
  (bookmark-exit-hook-internal): Save even if list is empty.
modified:
  lisp/ChangeLog
  lisp/bookmark.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-04 01:51:33 +0000
+++ b/lisp/ChangeLog    2013-04-04 01:59:09 +0000
@@ -1,3 +1,11 @@
+2013-04-04  Thierry Volpiatto  <address@hidden>
+
+       * bookmark.el: Fix deletion of bookmarks (bug#13972).
+       (bookmark-bmenu-list): Don't toggle filenames if alist is empty.
+       (bookmark-bmenu-execute-deletions): Only skip first line if it's
+       the header.
+       (bookmark-exit-hook-internal): Save even if list is empty.
+
 2013-04-04  Yann Hodique  <address@hidden>  (tiny change)
 
        * emacs-lisp/package.el (package-pinned-packages): New var.

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2013-03-07 22:35:47 +0000
+++ b/lisp/bookmark.el  2013-04-04 01:59:09 +0000
@@ -1582,8 +1582,8 @@
     (if bookmark-bmenu-use-header-line
        (bookmark-bmenu-set-header)
       (forward-line bookmark-bmenu-inline-header-height))
-    (if bookmark-bmenu-toggle-filenames
-        (bookmark-bmenu-toggle-filenames t))))
+    (when (and bookmark-alist bookmark-bmenu-toggle-filenames)
+      (bookmark-bmenu-toggle-filenames t))))
 
 ;;;###autoload
 (defalias 'list-bookmarks 'bookmark-bmenu-list)
@@ -1998,7 +1998,8 @@
                        (progn (end-of-line) (point))))))
         (o-col     (current-column)))
     (goto-char (point-min))
-    (forward-line 1)
+    (unless bookmark-bmenu-use-header-line
+      (forward-line 1))
     (while (re-search-forward "^D" (point-max) t)
       (bookmark-delete (bookmark-bmenu-bookmark) t)) ; pass BATCH arg
     (bookmark-bmenu-list)
@@ -2186,8 +2187,7 @@
   "Save bookmark state, if necessary, at Emacs exit time.
 This also runs `bookmark-exit-hook'."
   (run-hooks 'bookmark-exit-hook)
-  (and bookmark-alist
-       (bookmark-time-to-save-p t)
+  (and (bookmark-time-to-save-p t)
        (bookmark-save)))
 
 (unless noninteractive