From d5e637154f5084076b1a348155fc68139747acca Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 15 Oct 2009 01:50:17 +0000 Subject: 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'. --- lisp/emacs-lisp/crm.el | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'lisp/emacs-lisp/crm.el') diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 12d92bc0a6d..e6bd3332650 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -228,21 +228,16 @@ This function is modeled after `minibuffer-complete-and-exit'." (forward-char 1)) (if doexit (exit-minibuffer)))) -(defun crm--choose-completion-string (choice buffer mini-p base-size) +(defun crm--choose-completion-string (choice buffer base-position + &rest ignored) "Completion string chooser for `completing-read-multiple'. This is called from `choose-completion-string-functions'. It replaces the string that is currently being completed, without exiting the minibuffer." - (let ((ol (crm--select-current-element))) - (if base-size - (delete-region (+ base-size (field-beginning)) (point)) - (choose-completion-delete-max-match choice)) - (insert choice) - (remove-text-properties (- (point) (length choice)) (point) - '(mouse-face nil)) - ;; Update point in the window that BUFFER is showing in. - (let ((window (get-buffer-window buffer t))) - (set-window-point window (point))))) + (let ((completion-no-auto-exit t) + (choose-completion-string-functions nil)) + (choose-completion-string choice buffer base-position) + t)) ;; superemulates behavior of completing_read in src/minibuf.c ;;;###autoload -- cgit v1.2.1