andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(completion--do-completion): Move point even if the completion makes no change.

Browse source 
(completion-pcm-try-completion): Fix computation of new point.
This commit is contained in:
Stefan Monnier 2008-04-30 03:41:39 +00:00
parent 2f0adb0b8c
commit 81ff94589d
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2008-04-30 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (completion--do-completion): Move point even if the
completion makes no change.
(completion-pcm-try-completion): Fix computation of new point.
2008-04-30 David Hansen <david.hansen@gmx.net>
* dired.el: Require 'cl.

19
lisp/minibuffer.el
View file

@ -360,8 +360,9 @@ E = after completion we now have an Exact match.
;; Insert in minibuffer the chars we got.
(goto-char end)
(insert completion)
(delete-region beg end)
(goto-char (+ beg comp-pos)))
(delete-region beg end))
;; Move point.
(goto-char (+ beg comp-pos))
(if (not (or unchanged completed))
;; The case of the string changed, but that's all. We're not sure
@ -1283,13 +1284,17 @@ PATTERN is as returned by `completion-pcm--string->pattern'."
(all (completion-pcm--all-completions pattern table pred)))
(when all
(let* ((mergedpat (completion-pcm--merge-completions all pattern))
;; `mergedpat' is in reverse order.
(pointpat (or (memq 'point mergedpat) (memq 'any mergedpat)))
;; New pos from the end.
;; `mergedpat' is in reverse order. Place new point (by
;; 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)
margedpat))
;; New pos from the start.
(newpos (length (completion-pcm--pattern->string pointpat)))
;; Do it afterwards because it changes `pointpat' by sideeffect.
;; Do it afterwards because it changes `pointpat' by sideeffect.
(merged (completion-pcm--pattern->string (nreverse mergedpat))))
(cons merged (- (length merged) newpos))))))
(cons merged newpos)))))
(provide 'minibuffer)