1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/subr.el b/lisp/subr.el
index c1614c2e03f..de7d919abfe 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2695,6 +2695,7 @@ Also discard all previous input in the minibuffer."
   (interactive)
   (delete-minibuffer-contents)
   (ding)
+  (discard-input)
   (minibuffer-message "Wrong answer")
   (sit-for 2))
 
@@ -2794,6 +2795,7 @@ Also discard all previous input in the minibuffer."
   (interactive)
   (delete-minibuffer-contents)
   (ding)
+  (discard-input)
   (minibuffer-message "Please answer y or n")
   (sit-for 2))
 
@@ -4607,7 +4609,7 @@ This function is called directly from the C code."
                                        (string-match "\\.elc?\\>" file))
                             obarray))
            (msg (format "Package %s is deprecated" package))
-           (fun (lambda (msg) (message "%s" msg))))
+           (fun (lambda (msg) (discard-input) (message "%s" msg))))
       ;; Cribbed from cl--compiling-file.
       (when (or (not (fboundp 'byte-compile-warning-enabled-p))
                 (byte-compile-warning-enabled-p 'obsolete package))