aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2008-03-22 00:11:53 +0000
committerJuri Linkov2008-03-22 00:11:53 +0000
commitec800cf0a2794bc36f6f9889adfa694991257281 (patch)
treef27ddaccf606a0dc0c673d4844c7edf611018dad
parentdf27f31fa66959eef1b69a0d02033eb41d8b78fb (diff)
downloademacs-ec800cf0a2794bc36f6f9889adfa694991257281.tar.gz
emacs-ec800cf0a2794bc36f6f9889adfa694991257281.zip
(lisp-complete-symbol):
Use `minibuffer-message' to display message "No completions of %s" when this command is called in the minibuffer.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/lisp.el4
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d009c258038..fad90534fe9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -25,6 +25,10 @@
25 (shell-dynamic-complete-environment-variable): Don't display 25 (shell-dynamic-complete-environment-variable): Don't display
26 completion messages when command is called in the minibuffer. 26 completion messages when command is called in the minibuffer.
27 27
28 * emacs-lisp/lisp.el (lisp-complete-symbol):
29 Use `minibuffer-message' to display message "No completions of %s"
30 when this command is called in the minibuffer.
31
28 * bindings.el (standard-mode-line-modes): Put special help-echo 32 * bindings.el (standard-mode-line-modes): Put special help-echo
29 tooltip on recursive edit %[ %] mode-line constructs. 33 tooltip on recursive edit %[ %] mode-line constructs.
30 34
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 2829be961ca..ee308719821 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -667,7 +667,9 @@ considered."
667 (completion (try-completion pattern obarray predicate))) 667 (completion (try-completion pattern obarray predicate)))
668 (cond ((eq completion t)) 668 (cond ((eq completion t))
669 ((null completion) 669 ((null completion)
670 (message "Can't find completion for \"%s\"" pattern) 670 (if (window-minibuffer-p (selected-window))
671 (minibuffer-message (format " [No completions of \"%s\"]" pattern))
672 (message "Can't find completion for \"%s\"" pattern))
671 (ding)) 673 (ding))
672 ((not (string= pattern completion)) 674 ((not (string= pattern completion))
673 (delete-region beg end) 675 (delete-region beg end)