2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70bb9bce334..b74e4c6f9a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
 
+        * progmodes/flymake.el (flymake-post-syntax-check):
+        Fix typo in error message.
+
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
         * hexl.el (hexl-printable-character): Fix check of `hexl-iso',
         which is always a string.  (Bug#5313)
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 865cd153be1..4af331c5c29 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -643,7 +643,7 @@ It's flymake process filter."
             (flymake-report-status "" "")       ; PASSED
           (if (not flymake-check-was-interrupted)
               (flymake-report-fatal-status "CFGERR"
-                                           (format "Configuration error has occured while running %s" command))
+                                           (format "Configuration error has occurred while running %s" command))
             (flymake-report-status nil ""))) ; "STOPPED"
       (flymake-report-status (format "%d/%d" err-count warn-count) ""))))