procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(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-16 16:59:58 +00:00
parent e58914d089
commit 1de49d4e21
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -6,11 +6,16 @@
2007-07-16 Thien-Thi Nguyen <ttn@gnuvola.org> 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 * emacs-lisp/lisp-mode.el (calculate-lisp-indent): In the
case of alignment under a constant symbol, find and consider case of alignment under a constant symbol, find and consider
the sexp actually at indentation to be the "last sexp". 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 * mouse.el (mouse-yank-secondary): Better error message if no
secondary selection. secondary selection.

11
lisp/bookmark.el
View file

@ -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 ;;Return the bookmark-alist for display. If the bookmark-sort-flag
;;is non-nil, then return a sorted copy of the alist. ;;is non-nil, then return a sorted copy of the alist.
(if bookmark-sort-flag (if bookmark-sort-flag
(setq bookmark-alist (sort (copy-alist bookmark-alist)
(sort (copy-alist bookmark-alist) (function
(function (lambda (x y) (string-lessp (car x) (car y)))))
(lambda (x y) (string-lessp (car x) (car y)))))))) bookmark-alist))
(defvar bookmark-after-jump-hook nil (defvar bookmark-after-jump-hook nil
@ -1590,7 +1590,6 @@ deletion, or > if it is flagged for displaying."
(insert "% Bookmark\n- --------\n") (insert "% Bookmark\n- --------\n")
(add-text-properties (point-min) (point) (add-text-properties (point-min) (point)
'(font-lock-face bookmark-menu-heading)) '(font-lock-face bookmark-menu-heading))
(bookmark-maybe-sort-alist)
(mapcar (mapcar
(lambda (full-record) (lambda (full-record)
;; if a bookmark has an annotation, prepend a "*" ;; 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"))) help-echo "mouse-2: go to this bookmark in other window")))
(insert "\n") (insert "\n")
))) )))
bookmark-alist)) (bookmark-maybe-sort-alist)))
(goto-char (point-min)) (goto-char (point-min))
(forward-line 2) (forward-line 2)
(bookmark-bmenu-mode) (bookmark-bmenu-mode)