[Emacs-diffs] emacs/lisp ChangeLog minibuffer.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/12/05 01:22:59

Modified files:
        lisp           : ChangeLog minibuffer.el 

Log message:
        (completion-pcm--merge-try): Also consider placing point after a star, 
if
        that's the only place where modifications can make progress.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16823&r2=1.16824
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16823
retrieving revision 1.16824
diff -u -b -r1.16823 -r1.16824
--- ChangeLog   5 Dec 2009 00:24:03 -0000       1.16823
+++ ChangeLog   5 Dec 2009 01:22:54 -0000       1.16824
@@ -1,3 +1,9 @@
+2009-12-05  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vc-dir.el (vc-dir): Use the correct markup for showing keymaps

Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- minibuffer.el       25 Nov 2009 17:11:35 -0000      1.100
+++ minibuffer.el       5 Dec 2009 01:22:59 -0000       1.101
@@ -1984,7 +1984,9 @@
             ;; 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)))