aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/isearch.el4
-rw-r--r--lisp/minibuffer.el15
-rw-r--r--lisp/subr.el2
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.")
2011(defun isearch--momentary-message (string) 2011(defun isearch--momentary-message (string)
2012 "Print STRING at the end of the isearch prompt for 1 second." 2012 "Print STRING at the end of the isearch prompt for 1 second."
2013 (let ((message-log-max nil)) 2013 (let ((message-log-max nil))
2014 (message-in-echo-area "%s%s%s" 2014 (message "%s%s%s"
2015 (isearch-message-prefix nil isearch-nonincremental) 2015 (isearch-message-prefix nil isearch-nonincremental)
2016 isearch-message 2016 isearch-message
2017 (apply #'propertize (format " [%s]" string) 2017 (apply #'propertize (format " [%s]" string)
@@ -3168,7 +3168,7 @@ If there is no completion possible, say so and continue searching."
3168 (isearch-message-prefix ellipsis isearch-nonincremental) 3168 (isearch-message-prefix ellipsis isearch-nonincremental)
3169 m 3169 m
3170 (isearch-message-suffix c-q-hack))) 3170 (isearch-message-suffix c-q-hack)))
3171 (if c-q-hack m (let ((message-log-max nil)) (message-in-echo-area "%s" m))))) 3171 (if c-q-hack m (let ((message-log-max nil)) (message "%s" m)))))
3172 3172
3173(defun isearch--describe-regexp-mode (regexp-function &optional space-before) 3173(defun isearch--describe-regexp-mode (regexp-function &optional space-before)
3174 "Make a string for describing REGEXP-FUNCTION. 3174 "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'."
712 (progn 712 (progn
713 (if args 713 (if args
714 (apply #'message message args) 714 (apply #'message message args)
715 (message-in-echo-area "%s" message)) 715 (message "%s" message))
716 (prog1 (sit-for (or minibuffer-message-timeout 1000000)) 716 (prog1 (sit-for (or minibuffer-message-timeout 1000000))
717 (message-in-echo-area nil))) 717 (message nil)))
718 ;; Record message in the *Messages* buffer
719 (let ((inhibit-message t))
720 (if args
721 (apply #'message message args)
722 (message-in-echo-area "%s" message)))
723 ;; Clear out any old echo-area message to make way for our new thing. 718 ;; Clear out any old echo-area message to make way for our new thing.
724 (message-in-echo-area nil) 719 (message nil)
725 (setq message (if (and (null args) 720 (setq message (if (and (null args)
726 (string-match-p "\\` *\\[.+\\]\\'" message)) 721 (string-match-p "\\` *\\[.+\\]\\'" message))
727 ;; Make sure we can put-text-property. 722 ;; Make sure we can put-text-property.
@@ -1840,7 +1835,7 @@ variables.")
1840(defun minibuffer-completion-help (&optional start end) 1835(defun minibuffer-completion-help (&optional start end)
1841 "Display a list of possible completions of the current minibuffer contents." 1836 "Display a list of possible completions of the current minibuffer contents."
1842 (interactive) 1837 (interactive)
1843 (message-in-echo-area "Making completion list...") 1838 (message "Making completion list...")
1844 (let* ((start (or start (minibuffer-prompt-end))) 1839 (let* ((start (or start (minibuffer-prompt-end)))
1845 (end (or end (point-max))) 1840 (end (or end (point-max)))
1846 (string (buffer-substring start end)) 1841 (string (buffer-substring start end))
@@ -1851,7 +1846,7 @@ variables.")
1851 minibuffer-completion-predicate 1846 minibuffer-completion-predicate
1852 (- (point) start) 1847 (- (point) start)
1853 md))) 1848 md)))
1854 (message-in-echo-area nil) 1849 (message nil)
1855 (if (or (null completions) 1850 (if (or (null completions)
1856 (and (not (consp (cdr completions))) 1851 (and (not (consp (cdr completions)))
1857 (equal (car completions) string))) 1852 (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."
4616 (string-match "\\.elc?\\>" file)) 4616 (string-match "\\.elc?\\>" file))
4617 obarray)) 4617 obarray))
4618 (msg (format "Package %s is deprecated" package)) 4618 (msg (format "Package %s is deprecated" package))
4619 (fun (lambda (msg) (discard-input) (message "%s" msg)))) 4619 (fun (lambda (msg) (message "%s" msg))))
4620 ;; Cribbed from cl--compiling-file. 4620 ;; Cribbed from cl--compiling-file.
4621 (when (or (not (fboundp 'byte-compile-warning-enabled-p)) 4621 (when (or (not (fboundp 'byte-compile-warning-enabled-p))
4622 (byte-compile-warning-enabled-p 'obsolete package)) 4622 (byte-compile-warning-enabled-p 'obsolete package))