aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus2015-04-29 11:18:25 +0200
committerMichael Albinus2015-04-29 11:18:25 +0200
commit13cf735fb1c4685c0b4e7a7f8554d2064dc70073 (patch)
tree1d2ec670cf3a02a313fd415a196466e1f82686d7 /lisp
parent7fbdb57f801159618f761b8dd510516575b6c5b2 (diff)
parent3c0ea587daf8b17960b90603a70e3ac4057d883d (diff)
downloademacs-13cf735fb1c4685c0b4e7a7f8554d2064dc70073.tar.gz
emacs-13cf735fb1c4685c0b4e7a7f8554d2064dc70073.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/bytecomp.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 51bbf8a2944..d732c730bff 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -986,9 +986,8 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
986 "Like `message', except sometimes don't print to minibuffer. 986 "Like `message', except sometimes don't print to minibuffer.
987If the variable `byte-compile--interactive' is nil, the message 987If the variable `byte-compile--interactive' is nil, the message
988is not displayed on the minibuffer." 988is not displayed on the minibuffer."
989 (apply #'message format args) 989 (let ((inhibit-message (not byte-compile--interactive)))
990 (unless byte-compile--interactive 990 (apply #'message format args)))
991 (message nil)))
992 991
993;; Log something that isn't a warning. 992;; Log something that isn't a warning.
994(defun byte-compile-log-1 (string) 993(defun byte-compile-log-1 (string)