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 @@
         (shell-dynamic-complete-environment-variable): Don't display
         completion messages when command is called in the minibuffer.
 
+        * emacs-lisp/lisp.el (lisp-complete-symbol):
+        Use `minibuffer-message' to display message "No completions of %s"
+        when this command is called in the minibuffer.
+
         * bindings.el (standard-mode-line-modes): Put special help-echo
         tooltip on recursive edit %[ %] mode-line constructs.
 
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."
              (completion (try-completion pattern obarray predicate)))
         (cond ((eq completion t))
               ((null completion)
-               (message "Can't find completion for \"%s\"" pattern)
+               (if (window-minibuffer-p (selected-window))
+                   (minibuffer-message (format " [No completions of \"%s\"]" pattern))
+                 (message "Can't find completion for \"%s\"" pattern))
                (ding))
               ((not (string= pattern completion))
                (delete-region beg end)