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/iswitchb.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/iswitchb.el')
| -rw-r--r-- | lisp/iswitchb.el | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index 8a800143bd2..2f271c56f31 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -1013,19 +1013,13 @@ Return the modified list with the last element prepended to it." ;; XEmacs extents are put on by default, doesn't seem to be ;; any way of switching them off. - (display-completion-list (if iswitchb-matches - iswitchb-matches - iswitchb-buflist) + (display-completion-list (or iswitchb-matches iswitchb-buflist) :help-string "iswitchb " :activate-callback (lambda (x y z) (message "doesn't work yet, sorry!"))) ;; else running Emacs - (with-current-buffer standard-output - (fundamental-mode)) - (display-completion-list (if iswitchb-matches - iswitchb-matches - iswitchb-buflist)))) + (display-completion-list (or iswitchb-matches iswitchb-buflist)))) (setq iswitchb-common-match-inserted nil)))) ;;; KILL CURRENT BUFFER |