summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-12-05 20:11:01 -0500
committerGlenn Morris <rgm@gnu.org>2016-12-05 20:11:01 -0500
commit13d4dd1add0f13c0b1462f27f9fab55a1ff67a66 (patch)
tree68cda020ac6f14aacb56332226a8985bb3a8439c /lisp
parent81059cb970f95362eb52d6f53bbf02c70172048b (diff)
downloademacs-13d4dd1add0f13c0b1462f27f9fab55a1ff67a66.tar.gz
emacs-13d4dd1add0f13c0b1462f27f9fab55a1ff67a66.tar.bz2
emacs-13d4dd1add0f13c0b1462f27f9fab55a1ff67a66.zip
Tweak recent flymake change
* lisp/progmodes/flymake.el (flymake-report-fatal-status): Avoid double message when flymake-log-level >= 0. * doc/misc/flymake.texi (Customizable variables): No longer mention flymake-gui-warnings-enabled.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/flymake.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index cb9f7b66ff0..846ec22dbe3 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1198,10 +1198,11 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
(defun flymake-report-fatal-status (status warning)
"Display a warning and switch flymake mode off."
- ;; This should really by flymake-log 0, but that is not shown by default.
- ;; flymake-mode already uses message if no file name.
+ ;; This first message was always shown by default, and flymake-log
+ ;; does nothing by default, hence the use of message.
;; Another option is display-warning.
- (message "Flymake: %s. Flymake will be switched OFF" warning)
+ (if (< flymake-log-level 0)
+ (message "Flymake: %s. Flymake will be switched OFF" warning))
(flymake-mode 0)
(flymake-log 0 "switched OFF Flymake mode for buffer %s due to fatal status %s, warning %s"
(buffer-name) status warning))