(lisp-complete-symbol): Don't print progress messages if in the

minibuffer.

2 files changed, 32 insertions, 22 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 303099f0412..a7fc9d48f2d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * emacs-lisp/lisp.el (lisp-complete-symbol): Don't print progress
+        messages if in the minibuffer.
+
 2005-12-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * textmodes/flyspell.el (flyspell-check-word-p): Don't quote - in a RE.
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index f8a5b0b019e..30505c95223 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -572,29 +572,34 @@ considered."
               ((not (string= pattern completion))
                (delete-region beg end)
                (insert completion)
-               ;; Don't leave around a completions buffer that's outofdate.
-               (let ((win (get-buffer-window "*Completions*" 0)))
-                 (if win (with-selected-window win (bury-buffer)))))
+               ;; Don't leave around a completions buffer that's out of date.
+               (let ((win (get-buffer-window "*Completions*" 0)))
+                 (if win (with-selected-window win (bury-buffer)))))
               (t
-               (message "Making completion list...")
-               (let ((list (all-completions pattern obarray predicate)))
-                 (setq list (sort list 'string<))
-                 (or (eq predicate 'fboundp)
-                     (let (new)
-                       (while list
-                         (setq new (cons (if (fboundp (intern (car list)))
-                                             (list (car list) " <f>")
-                                           (car list))
-                                         new))
-                         (setq list (cdr list)))
-                       (setq list (nreverse new))))
-                 (if (> (length list) 1)
-                     (with-output-to-temp-buffer "*Completions*"
-                       (display-completion-list list pattern))
-                   ;; Don't leave around a completions buffer that's outofdate.
-                   (let ((win (get-buffer-window "*Completions*" 0)))
-                     (if win (with-selected-window win (bury-buffer))))))
-               (message "Making completion list...%s" "done")))))))
+               (let ((minibuf-is-in-use
+                      (eq (minibuffer-window) (selected-window))))
+                 (unless minibuf-is-in-use
+                   (message "Making completion list..."))
+                 (let ((list (all-completions pattern obarray predicate)))
+                   (setq list (sort list 'string<))
+                   (or (eq predicate 'fboundp)
+                       (let (new)
+                         (while list
+                           (setq new (cons (if (fboundp (intern (car list)))
+                                               (list (car list) " <f>")
+                                             (car list))
+                                           new))
+                           (setq list (cdr list)))
+                         (setq list (nreverse new))))
+                   (if (> (length list) 1)
+                       (with-output-to-temp-buffer "*Completions*"
+                         (display-completion-list list pattern))
+                     ;; Don't leave around a completions buffer that's
+                     ;; out of date.
+                     (let ((win (get-buffer-window "*Completions*" 0)))
+                       (if win (with-selected-window win (bury-buffer))))))
+                 (unless minibuf-is-in-use
+                   (message "Making completion list...%s" "done")))))))))
 
 ;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e
 ;;; lisp.el ends here