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)

3 files changed, 8 insertions, 13 deletions

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7c22e6ad971..4f3342782d3 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2011,7 +2011,7 @@ Turning on character-folding turns off regexp mode.")
 (defun isearch--momentary-message (string)
   "Print STRING at the end of the isearch prompt for 1 second."
   (let ((message-log-max nil))
-    (message-in-echo-area "%s%s%s"
+    (message "%s%s%s"
              (isearch-message-prefix nil isearch-nonincremental)
              isearch-message
              (apply #'propertize (format " [%s]" string)
@@ -3168,7 +3168,7 @@ If there is no completion possible, say so and continue searching."
              (isearch-message-prefix ellipsis isearch-nonincremental)
              m
              (isearch-message-suffix c-q-hack)))
-    (if c-q-hack m (let ((message-log-max nil)) (message-in-echo-area "%s" m)))))
+    (if c-q-hack m (let ((message-log-max nil)) (message "%s" m)))))
 
 (defun isearch--describe-regexp-mode (regexp-function &optional space-before)
   "Make a string for describing REGEXP-FUNCTION.
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)))
diff --git a/lisp/subr.el b/lisp/subr.el
index 1b2a1d643fb..ed55853bb27 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -4616,7 +4616,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) (discard-input) (message "%s" msg))))
+           (fun (lambda (msg) (message "%s" msg))))
       ;; Cribbed from cl--compiling-file.
       (when (or (not (fboundp 'byte-compile-warning-enabled-p))
                 (byte-compile-warning-enabled-p 'obsolete package))