From 25b54627386865f0f705d1fb9bbfc0f79e93a571 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 5 Dec 2009 01:22:54 +0000 Subject: [PATCH] (completion-pcm--merge-try): Also consider placing point after a star, if that's the only place where modifications can make progress. --- lisp/ChangeLog | 6 ++++++ lisp/minibuffer.el | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5304cacd5ad..b0ee691afa9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-12-05 Stefan Monnier + + * 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 * vc-dir.el (vc-dir): Use the correct markup for showing keymaps diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index cfe4d6f90de..66895b0fdb0 100644 --- 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)))