comparison lisp/simple.el @ 45607:98941f178aa2

(choose-completion-string-functions): New special hook. (choose-completion-string1): Renamed from choose-completion-string. (choose-completion-string): Run choose-completion-string-functions until success, and only call choose-completion-string1 if it fails.

45606:58b152d88dbd

		  (not (string= tail (substring string 0 len)))))
      (setq len (1- len))
      (forward-char 1))
    (delete-char len)))

;; Switch to BUFFER and insert the completion choice CHOICE.
;; BASE-SIZE, if non-nil, says how many characters of BUFFER's text
;; to keep.  If it is nil, use choose-completion-delete-max-match instead.

;; If BUFFER is the minibuffer, exit the minibuffer
;; unless it is reading a file name and CHOICE is a directory,
;; or completion-no-auto-exit is non-nil.
(defun choose-completion-string (choice &optional buffer base-size)
  (let ((buffer (or buffer completion-reference-buffer))
	(mini-p (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer))))
    ;; If BUFFER is a minibuffer, barf unless it's the currently
    ;; active minibuffer.
    (if (and mini-p

45607:98941f178aa2

		  (not (string= tail (substring string 0 len)))))
      (setq len (1- len))
      (forward-char 1))
    (delete-char len)))

(defvar choose-completion-string-functions nil
  "List of functions which may override the standard `choose-completion-string'.
Each function in the list is called in turn with arguments CHOICE BUFFER BASE-SIZE
like choose-completion-string.  If a function in the list returns non-nil, that
function is supposed to have inserted the completion in the minibuffer.
If all functions in the list return nil, use the default completion selection.")

;; Switch to BUFFER and insert the completion choice CHOICE.
;; BASE-SIZE, if non-nil, says how many characters of BUFFER's text
;; to keep.  If it is nil, use choose-completion-delete-max-match instead.

;; If BUFFER is the minibuffer, exit the minibuffer
;; unless it is reading a file name and CHOICE is a directory,
;; or completion-no-auto-exit is non-nil.
(defun choose-completion-string (choice &optional buffer base-size)
  (unless (run-hook-with-args-until-success 
	   'choose-completion-string-functions choice buffer base-size)
    (choose-completion-string1 choice buffer base-size)))

(defun choose-completion-string1 (choice &optional buffer base-size)
  (let ((buffer (or buffer completion-reference-buffer))
	(mini-p (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer))))
    ;; If BUFFER is a minibuffer, barf unless it's the currently
    ;; active minibuffer.
    (if (and mini-p