Commit 5e688290 authored by Romain Francoise's avatar Romain Francoise
Browse files

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

minibuffer.
parent 9c841316
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> 2005-12-21 Stefan Monnier <monnier@iro.umontreal.ca>
   
* textmodes/flyspell.el (flyspell-check-word-p): Don't quote - in a RE. * textmodes/flyspell.el (flyspell-check-word-p): Don't quote - in a RE.
......
...@@ -572,29 +572,34 @@ considered." ...@@ -572,29 +572,34 @@ considered."
((not (string= pattern completion)) ((not (string= pattern completion))
(delete-region beg end) (delete-region beg end)
(insert completion) (insert completion)
;; Don't leave around a completions buffer that's outofdate. ;; Don't leave around a completions buffer that's out of date.
(let ((win (get-buffer-window "*Completions*" 0))) (let ((win (get-buffer-window "*Completions*" 0)))
(if win (with-selected-window win (bury-buffer))))) (if win (with-selected-window win (bury-buffer)))))
(t (t
(message "Making completion list...") (let ((minibuf-is-in-use
(let ((list (all-completions pattern obarray predicate))) (eq (minibuffer-window) (selected-window))))
(setq list (sort list 'string<)) (unless minibuf-is-in-use
(or (eq predicate 'fboundp) (message "Making completion list..."))
(let (new) (let ((list (all-completions pattern obarray predicate)))
(while list (setq list (sort list 'string<))
(setq new (cons (if (fboundp (intern (car list))) (or (eq predicate 'fboundp)
(list (car list) " <f>") (let (new)
(car list)) (while list
new)) (setq new (cons (if (fboundp (intern (car list)))
(setq list (cdr list))) (list (car list) " <f>")
(setq list (nreverse new)))) (car list))
(if (> (length list) 1) new))
(with-output-to-temp-buffer "*Completions*" (setq list (cdr list)))
(display-completion-list list pattern)) (setq list (nreverse new))))
;; Don't leave around a completions buffer that's outofdate. (if (> (length list) 1)
(let ((win (get-buffer-window "*Completions*" 0))) (with-output-to-temp-buffer "*Completions*"
(if win (with-selected-window win (bury-buffer)))))) (display-completion-list list pattern))
(message "Making completion list...%s" "done"))))))) ;; 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 ;; arch-tag: aa7fa8a4-2e6f-4e9b-9cd9-fef06340e67e
;;; lisp.el ends here ;;; lisp.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment