(choose-completion-string): Set buffer before running

choose-completion-string-functions hook so it can be buffer-local.

diff --git a/lisp/simple.el b/lisp/simple.el
index 75d2cef8499e5430c369d1fa04fdaf7eef9a54db..e7498d67789f91c0851956b729414e0bef345aaf 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4297,11 +4297,12 @@ to decide what to delete."
                 (not (equal buffer
                             (window-buffer (active-minibuffer-window))))))
        (error "Minibuffer is not active for completion")
+      ;; Set buffer so buffer-local choose-completion-string-functions works.
+      (set-buffer buffer)
       (unless (run-hook-with-args-until-success
               'choose-completion-string-functions
               choice buffer mini-p base-size)
        ;; Insert the completion into the buffer where it was requested.
-       (set-buffer buffer)
        (if base-size
            (delete-region (+ base-size (if mini-p
                                            (minibuffer-prompt-end)