* lisp/minibuffer.el (completion-all-sorted-completions):

Use :completion-cycle-penalty text property if present.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e1bce10b980402c8dd0440223f2723ad6416274b..957038b3e40a2148eb1f7b376bdc636ad74edcdd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * minibuffer.el (completion-all-sorted-completions):
+       Use :completion-cycle-penalty text property if present.
+
 2011-03-16  Ken Manheimer  <ken.manheimer@gmail.com>
 
        * allout.el (allout-yank-processing): Adjust for new rebulleting

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 3c8628c9cfaccc32909a37c749f5cf57740f23c1..fa36da01cd9f2d4cc8ee12a9fc77b3338d52f2df 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -704,7 +704,15 @@ scroll the window of possible completions."
         (when last
           (setcdr last nil)
           ;; Prefer shorter completions.
-          (setq all (sort all (lambda (c1 c2) (< (length c1) (length c2)))))
+          (setq all (sort all (lambda (c1 c2)
+                                (let ((s1 (get-text-property
+                                           0 :completion-cycle-penalty c1))
+                                      (s2 (get-text-property
+                                           0 :completion-cycle-penalty c2)))
+                                  (if (eq s1 s2)
+                                      (< (length c1) (length c2))
+                                    (< (or s1 (length c1))
+                                       (or s2 (length c2))))))))
           ;; Prefer recently used completions.
           (let ((hist (symbol-value minibuffer-history-variable)))
             (setq all (sort all (lambda (c1 c2)