diff options
| author | Juri Linkov <juri@linkov.net> | 2019-12-16 01:58:14 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-12-16 01:58:14 +0200 |
| commit | 7254b6346229a7b71b69f71e2d8eee113f02585a (patch) | |
| tree | cdf52783a50d34acd37a235ba7fae7644c7b1564 /lisp/minibuffer.el | |
| parent | 1d52883047f0dd9a52d41060e164237923864265 (diff) | |
| download | emacs-7254b6346229a7b71b69f71e2d8eee113f02585a.tar.gz | |
Revert aa89c84e00d8dc85100e6fedab7631c415e6364d (bug#38457)
* src/editfns.c (Fmessage): Don't use minibuffer-message.
(Fmessage_in_echo_area): Remove function message-in-echo-area.
(syms_of_editfns): Remove variable message-in-echo-area.
* lisp/isearch.el (isearch--momentary-message): Remove message-in-echo-area.
* lisp/minibuffer.el (minibuffer-message): Don't record message
in the *Messages* buffer.
(minibuffer-completion-help): Remove message-in-echo-area.
* lisp/subr.el (do-after-load-evaluation): Remove discard-input (bug#38560)
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index f8888111caf..76d8ca44757 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -712,16 +712,11 @@ If ARGS are provided, then pass MESSAGE through `format-message'." (progn (if args (apply #'message message args) - (message-in-echo-area "%s" message)) + (message "%s" message)) (prog1 (sit-for (or minibuffer-message-timeout 1000000)) - (message-in-echo-area nil))) - ;; Record message in the *Messages* buffer - (let ((inhibit-message t)) - (if args - (apply #'message message args) - (message-in-echo-area "%s" message))) + (message nil))) ;; Clear out any old echo-area message to make way for our new thing. - (message-in-echo-area nil) + (message nil) (setq message (if (and (null args) (string-match-p "\\` *\\[.+\\]\\'" message)) ;; Make sure we can put-text-property. @@ -1840,7 +1835,7 @@ variables.") (defun minibuffer-completion-help (&optional start end) "Display a list of possible completions of the current minibuffer contents." (interactive) - (message-in-echo-area "Making completion list...") + (message "Making completion list...") (let* ((start (or start (minibuffer-prompt-end))) (end (or end (point-max))) (string (buffer-substring start end)) @@ -1851,7 +1846,7 @@ variables.") minibuffer-completion-predicate (- (point) start) md))) - (message-in-echo-area nil) + (message nil) (if (or (null completions) (and (not (consp (cdr completions))) (equal (car completions) string))) |