(completion-pcm--merge-try): Also consider placing point after a star, if

that's the only place where modifications can make progress.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5304cacd5ad3638b8fd9f7c5a01138f0fac21b99..b0ee691afa9040221d349161d5f186d0c36c78f7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * minibuffer.el (completion-pcm--merge-try): Also consider placing
+       point after a star, if that's the only place where modifications can
+       make progress.
+
 2009-12-05  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc-dir.el (vc-dir): Use the correct markup for showing keymaps

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index cfe4d6f90de37ec940d0d4b387520e80b2187739..66895b0fdb0237e8e9708d2f848d608a0aff74ac 100644 (file)
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1984,7 +1984,9 @@ filter out additional entries (because TABLE migth not obey PRED)."
             ;; order of preference) either at the old point, or at
             ;; the last place where there's something to choose, or
             ;; at the very end.
-             (pointpat (or (memq 'point mergedpat) (memq 'any mergedpat)
+             (pointpat (or (memq 'point mergedpat)
+                           (memq 'any   mergedpat)
+                           (memq 'star  mergedpat)
                           mergedpat))
              ;; New pos from the start.
              (newpos (length (completion-pcm--pattern->string pointpat)))