summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/flymake.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2eab5ba254b..805cee8021a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-04 Reuben Thomas <rrt@sc3d.org>
+
+ * progmodes/flymake.el (flymake-compilation-prevents-syntax-check):
+ Doc fix (Bug#8713).
+
2011-06-04 Chong Yidong <cyd@stupidchicken.com>
* repeat.el (repeat-on-final-keystroke): Fix type (Bug#8696).
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index da28a2e36f6..03e9956b845 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1112,7 +1112,7 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
(flymake-log 1 "Failed to delete dir %s, error ignored" dir-name))))
(defcustom flymake-compilation-prevents-syntax-check t
- "If non-nil, syntax check won't be started in case compilation is running."
+ "If non-nil, don't start syntax check if compilation is running."
:group 'flymake
:type 'boolean)