* bookmark.el (bookmark-completing-read): Sort bookmark names if

bookmark-sort-flag is non-nil (Bug#4653).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 301bcedc0a128662c4c56db3bee98c669bb3c004..42c2e6137167c164eaaffac94a0164fe9b235193 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-08  Markus Rost <rost@math.uni-bielefeld.de>
+
+       * bookmark.el (bookmark-completing-read): Sort bookmark names if
+       bookmark-sort-flag is non-nil (Bug#4653).
+
 2009-11-08  Chong Yidong  <cyd@stupidchicken.com>
 
        * cedet/semantic/ctxt.el (semantic-get-local-variables): Disable

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index f1a4409cc85930b6e0c9b3acace048e891e56198..a3c315acbc26c644c42dc8b1deb65fceecf68c56 100644 (file)
--- 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
 the empty string."
   (bookmark-maybe-load-default-file) ; paranoia
   (if (listp last-nonmenu-event)
-      (bookmark-menu-popup-paned-menu t prompt (bookmark-all-names))
+      (bookmark-menu-popup-paned-menu t prompt
+                                     (if bookmark-sort-flag
+                                         (sort (bookmark-all-names)
+                                               'string-lessp)
+                                       (bookmark-all-names)))
     (let* ((completion-ignore-case bookmark-completion-ignore-case)
           (default default)
           (prompt (concat prompt (if default