diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-15 01:50:17 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-15 01:50:17 +0000 |
commit | d5e637154f5084076b1a348155fc68139747acca (patch) | |
tree | 8c95bf13b4ca185b32dfa84ab9fe1b409f43632b /lisp/ido.el | |
parent | b0d6136e736a7c3a843bb56049ed19219312150c (diff) | |
download | emacs-d5e637154f5084076b1a348155fc68139747acca.tar.gz |
Replace completion-base-size by completion-base-position to fix bugs
such as (bug#4699).
* simple.el (completion-base-position): New var.
(completion-base-size): Mark as obsolete.
(choose-completion): Make it work for mouse events as well.
Pass the new base-position to choose-completion-string.
(choose-completion-guess-base-position): New function, extracted from
choose-completion-delete-max-match.
(choose-completion-delete-max-match): Use it. Make obsolete.
(choose-completion-string): Use the new base-position info.
(completion-root-regexp): Delete.
(completion-setup-function): Preserve completion-base-position.
Eliminate obsolete base-size manipulation.
* minibuffer.el (display-completion-list): Don't mess with base-size.
(minibuffer-completion-help): Set completion-base-position instead.
* mouse.el (mouse-choose-completion): Redefine as a mere alias to
choose-completion.
* textmodes/bibtex.el (bibtex-complete):
* emacs-lisp/crm.el (crm--choose-completion-string):
Adjust to new calling convention.
* complete.el (partial-completion-mode): Use minibufferp to avoid
bumping into incompatible change to choose-completion-string-functions.
* ido.el (ido-choose-completion-string): Make its calling convention
more permissive.
* comint.el (comint-dynamic-list-input-ring-select): Remove obsolete
base-size manipulation.
(comint-dynamic-list-input-ring): Use dotimes and push.
* iswitchb.el (iswitchb-completion-help): Remove dead-code call to
fundamental-mode. Use `or'.
Diffstat (limited to 'lisp/ido.el')
-rw-r--r-- | lisp/ido.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index ce49915d17f..d8f2800739f 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -3757,7 +3757,7 @@ for first matching file." ;; Return dotted pair (RES . 1). (cons res 1)) -(defun ido-choose-completion-string (choice buffer mini-p base-size) +(defun ido-choose-completion-string (choice &rest ignored) (when (ido-active) ;; Insert the completion into the buffer where completion was requested. (if (get-buffer ido-completion-buffer) |