# HG changeset patch
# User Thien-Thi Nguyen <ttn@gnuvola.org>
# Date 1184688771 0
# Node ID ba35decf8cc19964d2b770b06b004b373fa6178e
# Parent  639d3d9bce58b1c98bfd160eeca24961b5cd0726
(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.

diff -r 639d3d9bce58 -r ba35decf8cc1 lisp/bookmark.el
--- a/lisp/bookmark.el	Tue Jul 17 16:10:13 2007 +0000
+++ b/lisp/bookmark.el	Tue Jul 17 16:12:51 2007 +0000
@@ -1044,10 +1044,10 @@
   ;;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
@@ -1568,7 +1568,6 @@
     (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 "*"
@@ -1591,7 +1590,7 @@
 		  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)