aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2019-11-30 23:33:41 +0200
committerJuri Linkov2019-11-30 23:33:41 +0200
commit54c792ece6c20297571aa68c613075c8a8152bcc (patch)
tree0240d377af99d9cd709796b3fe9ed4f7351d07cb
parent757e66afdc1cd4f0a261d368cafd5009e04084a4 (diff)
downloademacs-54c792ece6c20297571aa68c613075c8a8152bcc.tar.gz
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."
2695 (interactive) 2695 (interactive)
2696 (delete-minibuffer-contents) 2696 (delete-minibuffer-contents)
2697 (ding) 2697 (ding)
2698 (discard-input)
2698 (minibuffer-message "Wrong answer") 2699 (minibuffer-message "Wrong answer")
2699 (sit-for 2)) 2700 (sit-for 2))
2700 2701
@@ -2794,6 +2795,7 @@ Also discard all previous input in the minibuffer."
2794 (interactive) 2795 (interactive)
2795 (delete-minibuffer-contents) 2796 (delete-minibuffer-contents)
2796 (ding) 2797 (ding)
2798 (discard-input)
2797 (minibuffer-message "Please answer y or n") 2799 (minibuffer-message "Please answer y or n")
2798 (sit-for 2)) 2800 (sit-for 2))
2799 2801
@@ -4607,7 +4609,7 @@ This function is called directly from the C code."
4607 (string-match "\\.elc?\\>" file)) 4609 (string-match "\\.elc?\\>" file))
4608 obarray)) 4610 obarray))
4609 (msg (format "Package %s is deprecated" package)) 4611 (msg (format "Package %s is deprecated" package))
4610 (fun (lambda (msg) (message "%s" msg)))) 4612 (fun (lambda (msg) (discard-input) (message "%s" msg))))
4611 ;; Cribbed from cl--compiling-file. 4613 ;; Cribbed from cl--compiling-file.
4612 (when (or (not (fboundp 'byte-compile-warning-enabled-p)) 4614 (when (or (not (fboundp 'byte-compile-warning-enabled-p))
4613 (byte-compile-warning-enabled-p 'obsolete package)) 4615 (byte-compile-warning-enabled-p 'obsolete package))