From 089fb40e2782ed51463cc062f37fb4adbe26f83c Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Tue, 17 Jul 2007 16:14:25 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 10 ++++++++++ lisp/bookmark.el | 11 +++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 062f1ce1dcc..30b8a11c088 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2007-07-17 Thien-Thi Nguyen + + * bookmark.el (bookmark-show-all-annotations): + Make sure each inserted annotation ends with newline. + + (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. + 2007-07-17 Dan Nicolaescu * vc.el: Add more info about the vc-registered function. diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 816ed8b182e..d0c131e386e 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1044,10 +1044,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 @@ -1568,7 +1568,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 "*" @@ -1591,7 +1590,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) -- 2.39.2