aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2009-12-05 01:22:54 +0000
committerStefan Monnier2009-12-05 01:22:54 +0000
commit25b54627386865f0f705d1fb9bbfc0f79e93a571 (patch)
treed6d5067de6e49713e6be1b4cdce9482835bdd1b6
parent35639eb45f4c10ff49641116dd0e7bbd06b6363a (diff)
downloademacs-25b54627386865f0f705d1fb9bbfc0f79e93a571.tar.gz
emacs-25b54627386865f0f705d1fb9bbfc0f79e93a571.zip
(completion-pcm--merge-try): Also consider placing point after a star, if
that's the only place where modifications can make progress.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/minibuffer.el4
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5304cacd5ad..b0ee691afa9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12009-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuffer.el (completion-pcm--merge-try): Also consider placing
4 point after a star, if that's the only place where modifications can
5 make progress.
6
12009-12-05 Dan Nicolaescu <dann@ics.uci.edu> 72009-12-05 Dan Nicolaescu <dann@ics.uci.edu>
2 8
3 * vc-dir.el (vc-dir): Use the correct markup for showing keymaps 9 * 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)."
1984 ;; order of preference) either at the old point, or at 1984 ;; order of preference) either at the old point, or at
1985 ;; the last place where there's something to choose, or 1985 ;; the last place where there's something to choose, or
1986 ;; at the very end. 1986 ;; at the very end.
1987 (pointpat (or (memq 'point mergedpat) (memq 'any mergedpat) 1987 (pointpat (or (memq 'point mergedpat)
1988 (memq 'any mergedpat)
1989 (memq 'star mergedpat)
1988 mergedpat)) 1990 mergedpat))
1989 ;; New pos from the start. 1991 ;; New pos from the start.
1990 (newpos (length (completion-pcm--pattern->string pointpat))) 1992 (newpos (length (completion-pcm--pattern->string pointpat)))