summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2019-11-10 23:21:46 +0200
committerJuri Linkov <juri@linkov.net>2019-11-10 23:21:46 +0200
commit7e151f5bcfe431c31528743705e6ab56cf8dc220 (patch)
treea7a44848063b2e0483f57d5eb7d756edc77af137 /lisp/emacs-lisp
parent0154e41b184a0b9938fafd9eca15399b4d5e477f (diff)
downloademacs-7e151f5bcfe431c31528743705e6ab56cf8dc220.tar.gz
emacs-7e151f5bcfe431c31528743705e6ab56cf8dc220.tar.bz2
emacs-7e151f5bcfe431c31528743705e6ab56cf8dc220.zip
* lisp/autorevert.el: Use 'minibuffer-message' to not obscure the prompt.
* lisp/autorevert.el (auto-revert-handler): Use 'minibuffer-message' instead of 'message'. Call it from the original window's buffer that in case of the minibuffer should be current, so minibuffer-message could add a message to it. (Bug#34614) * lisp/emacs-lisp/ert-x.el (ert--make-message-advice): Add nil to the list of values to not use for format-message, because minibuffer-message calls 'message' with nil argument, and tests fail.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/ert-x.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index ee561d5b953..d09d3ae11e3 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -321,7 +321,7 @@ code under test from the behavior of the *Messages* buffer."
COLLECTOR will be called with the message before it is passed
to the real `message'."
(lambda (func &rest args)
- (if (or (null args) (equal (car args) ""))
+ (if (or (null args) (member (car args) '("" nil)))
(apply func args)
(let ((msg (apply #'format-message args)))
(funcall collector (concat msg "\n"))