diff options
| author | Reuben Thomas | 2011-06-04 19:06:53 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-06-04 19:06:53 -0400 |
| commit | b1adde906f7265d93b392a7ed2da37df39c65ae1 (patch) | |
| tree | 2488f79c96124a1ab1334aa7a603b7f6b1ab4b63 | |
| parent | a800408659eaa9ac63e299ae750046300634e1f9 (diff) | |
| download | emacs-b1adde906f7265d93b392a7ed2da37df39c65ae1.tar.gz emacs-b1adde906f7265d93b392a7ed2da37df39c65ae1.zip | |
* flymake.el (flymake-compilation-prevents-syntax-check): Doc fix (Bug#8713).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/flymake.el | 2 |
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 @@ | |||
| 1 | 2011-06-04 Reuben Thomas <rrt@sc3d.org> | ||
| 2 | |||
| 3 | * progmodes/flymake.el (flymake-compilation-prevents-syntax-check): | ||
| 4 | Doc fix (Bug#8713). | ||
| 5 | |||
| 1 | 2011-06-04 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-06-04 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * repeat.el (repeat-on-final-keystroke): Fix type (Bug#8696). | 8 | * 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'." | |||
| 1112 | (flymake-log 1 "Failed to delete dir %s, error ignored" dir-name)))) | 1112 | (flymake-log 1 "Failed to delete dir %s, error ignored" dir-name)))) |
| 1113 | 1113 | ||
| 1114 | (defcustom flymake-compilation-prevents-syntax-check t | 1114 | (defcustom flymake-compilation-prevents-syntax-check t |
| 1115 | "If non-nil, syntax check won't be started in case compilation is running." | 1115 | "If non-nil, don't start syntax check if compilation is running." |
| 1116 | :group 'flymake | 1116 | :group 'flymake |
| 1117 | :type 'boolean) | 1117 | :type 'boolean) |
| 1118 | 1118 | ||