(bookmark-maybe-sort-alist): Don't modify bookmark-alist.

Instead, if not sorting, simply return it.
(bookmark-bmenu-list): Call bookmark-maybe-sort-alist
for its return value, not for its side effect.

2 files changed, 11 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 973e5eeaee5..31c25511d5d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,11 +6,16 @@
 
 2007-07-16  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
+        * bookmark.el (bookmark-maybe-sort-alist): Don't modify
+        bookmark-alist.  Instead, if not sorting, simply return it.
+        (bookmark-bmenu-list): Call bookmark-maybe-sort-alist
+        for its return value, not for its side effect.
+
         * emacs-lisp/lisp-mode.el (calculate-lisp-indent): In the
         case of alignment under a constant symbol, find and consider
         the sexp actually at indentation to be the "last sexp".
 
-2007-07-13  Drew Adams  <drew.adams@oracle.com>
+2007-07-16  Drew Adams  <drew.adams@oracle.com>
 
         * mouse.el (mouse-yank-secondary): Better error message if no
         secondary selection.
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 5dc783d13d9..f8440731419 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1045,10 +1045,10 @@ For example, if this is a Info buffer, return the Info file's name."
   ;;Return the bookmark-alist for display.  If the bookmark-sort-flag
   ;;is non-nil, then return a sorted copy of the alist.
   (if bookmark-sort-flag
-      (setq bookmark-alist
-            (sort (copy-alist bookmark-alist)
-                  (function
-                   (lambda (x y) (string-lessp (car x) (car y))))))))
+      (sort (copy-alist bookmark-alist)
+            (function
+             (lambda (x y) (string-lessp (car x) (car y)))))
+    bookmark-alist))
 
 
 (defvar bookmark-after-jump-hook nil
@@ -1590,7 +1590,6 @@ deletion, or > if it is flagged for displaying."
     (insert "% Bookmark\n- --------\n")
     (add-text-properties (point-min) (point)
                          '(font-lock-face bookmark-menu-heading))
-    (bookmark-maybe-sort-alist)
     (mapcar
      (lambda (full-record)
        ;; if a bookmark has an annotation, prepend a "*"
@@ -1613,7 +1612,7 @@ deletion, or > if it is flagged for displaying."
                   help-echo "mouse-2: go to this bookmark in other window")))
            (insert "\n")
            )))
-     bookmark-alist))
+     (bookmark-maybe-sort-alist)))
   (goto-char (point-min))
   (forward-line 2)
   (bookmark-bmenu-mode)