Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Instead, if not sorting, simply return it.
(bookmark-bmenu-list): Call bookmark-maybe-sort-alist
for its return value, not for its side effect.
This commit is contained in:
Thien-Thi Nguyen 2007-07-17 16:14:25 +00:00
parent 23fe28f248
commit 089fb40e27
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2007-07-17 Thien-Thi Nguyen <ttn@gnuvola.org>
* 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 <dann@ics.uci.edu>
* vc.el: Add more info about the vc-registered function.

11
lisp/bookmark.el
View file

@ -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)