procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give completion field overlays high priority.

Browse source 
* lisp/minibuffer.el (completion-in-region, completion-help-at-point):
Give the completion field overlay a high priority.

Fixes: debbugs:6830
This commit is contained in:
Chong Yidong 2012-03-10 15:08:51 +08:00
parent 82dcf4e4d8
commit 7a2c7ca7ca
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2012-03-10 Chong Yidong <cyd@gnu.org>
* minibuffer.el (completion-in-region, completion-help-at-point):
Give the completion field overlay a high priority (Bug#6830).
* dired.el (dired-goto-file): Recognize absolute file name
listings (Bug#7126).
(dired-goto-file-1): New helper function.

8
lisp/minibuffer.el
View file

@ -1483,10 +1483,13 @@ exit."
(minibuffer-completion-predicate predicate)
(ol (make-overlay start end nil nil t)))
(overlay-put ol 'field 'completion)
;; HACK: if the text we are completing is already in a field, we
;; want the completion field to take priority (e.g. Bug#6830).
(overlay-put ol 'priority 100)
(when completion-in-region-mode-predicate
(completion-in-region-mode 1)
(setq completion-in-region--data
(list (current-buffer) start end collection)))
(list (current-buffer) start end collection)))
(unwind-protect
(call-interactively 'minibuffer-complete)
(delete-overlay ol)))))
@ -1653,9 +1656,10 @@ The completion method is determined by `completion-at-point-functions'."
;; introduce a corresponding hook (plus another for word-completion,
;; and another for force-completion, maybe?).
(overlay-put ol 'field 'completion)
(overlay-put ol 'priority 100)
(completion-in-region-mode 1)
(setq completion-in-region--data
(list (current-buffer) start end collection))
(list (current-buffer) start end collection))
(unwind-protect
(call-interactively 'minibuffer-completion-help)
(delete-overlay ol))))