[Emacs-diffs] Changes to emacs/lisp/simple.el

[Kim F . Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.659 emacs/lisp/simple.el:1.660
*** emacs/lisp/simple.el:1.659  Mon Sep  6 18:51:05 2004
--- emacs/lisp/simple.el        Sun Sep 12 18:52:03 2004
***************
*** 4297,4307 ****
                 (not (equal buffer
                             (window-buffer (active-minibuffer-window))))))
        (error "Minibuffer is not active for completion")
        (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)
--- 4297,4308 ----
                 (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.
        (if base-size
            (delete-region (+ base-size (if mini-p
                                            (minibuffer-prompt-end)