Mercurial > emacs

changeset 67730:1ee1a77d8b03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(lisp-complete-symbol): Don't print progress messages if in the minibuffer.
author Romain Francoise <romain@orebokech.com>
date Thu, 22 Dec 2005 07:41:04 +0000
parents 88f36bfe01f5
children c1eaa6ea0192
files lisp/ChangeLog lisp/emacs-lisp/lisp.el
diffstat 2 files changed, 32 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Dec 22 01:51:40 2005 +0000
+++ b/lisp/ChangeLog	Thu Dec 22 07:41:04 2005 +0000
@@ -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.
--- a/lisp/emacs-lisp/lisp.el	Thu Dec 22 01:51:40 2005 +0000
+++ b/lisp/emacs-lisp/lisp.el	Thu Dec 22 07:41:04 2005 +0000
@@ -572,29 +572,34 @@
 	      ((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