aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-11-08 23:01:45 +0000
committerChong Yidong2009-11-08 23:01:45 +0000
commitfd4489f0e4fe65b39921ffbc27f3e19da68515c6 (patch)
treef5e8601c48f79597adc48e77b63aad23ee8c73d5
parent9bf7dc8aba965b831c7356bd4d28c431752c02f6 (diff)
downloademacs-fd4489f0e4fe65b39921ffbc27f3e19da68515c6.tar.gz
emacs-fd4489f0e4fe65b39921ffbc27f3e19da68515c6.zip
* bookmark.el (bookmark-completing-read): Sort bookmark names if
bookmark-sort-flag is non-nil (Bug#4653).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bookmark.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 301bcedc0a1..42c2e613716 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-11-08 Markus Rost <rost@math.uni-bielefeld.de>
2
3 * bookmark.el (bookmark-completing-read): Sort bookmark names if
4 bookmark-sort-flag is non-nil (Bug#4653).
5
12009-11-08 Chong Yidong <cyd@stupidchicken.com> 62009-11-08 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * cedet/semantic/ctxt.el (semantic-get-local-variables): Disable 8 * cedet/semantic/ctxt.el (semantic-get-local-variables): Disable
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index f1a4409cc85..a3c315acbc2 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -459,7 +459,11 @@ Optional second arg DEFAULT is a string to return if the user enters
459the empty string." 459the empty string."
460 (bookmark-maybe-load-default-file) ; paranoia 460 (bookmark-maybe-load-default-file) ; paranoia
461 (if (listp last-nonmenu-event) 461 (if (listp last-nonmenu-event)
462 (bookmark-menu-popup-paned-menu t prompt (bookmark-all-names)) 462 (bookmark-menu-popup-paned-menu t prompt
463 (if bookmark-sort-flag
464 (sort (bookmark-all-names)
465 'string-lessp)
466 (bookmark-all-names)))
463 (let* ((completion-ignore-case bookmark-completion-ignore-case) 467 (let* ((completion-ignore-case bookmark-completion-ignore-case)
464 (default default) 468 (default default)
465 (prompt (concat prompt (if default 469 (prompt (concat prompt (if default