summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2019-11-30 23:33:41 +0200
committerJuri Linkov <juri@linkov.net>2019-11-30 23:33:41 +0200
commit54c792ece6c20297571aa68c613075c8a8152bcc (patch)
tree0240d377af99d9cd709796b3fe9ed4f7351d07cb
parent757e66afdc1cd4f0a261d368cafd5009e04084a4 (diff)
downloademacs-54c792ece6c20297571aa68c613075c8a8152bcc.tar.gz
emacs-54c792ece6c20297571aa68c613075c8a8152bcc.tar.bz2
emacs-54c792ece6c20297571aa68c613075c8a8152bcc.zip
* lisp/subr.el: Add discard-input to more functions.
* lisp/subr.el (read-char-from-minibuffer-insert-other) (y-or-n-p-insert-other): Use discard-input in case of user mistake. (do-after-load-evaluation): Add discard-input before calling 'message', so in case of the active minibuffer, calling minibuffer-message will allow sit-for to wait the complete timeout, because discard-input will discard all initial events that prevent sit-for from waiting during startup. https://lists.gnu.org/archive/html/emacs-devel/2019-11/msg00581.html
-rw-r--r--lisp/subr.el4
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))