* lisp/progmodes/compile.el (compilation-mode-font-lock-keywords):

Don't confuse -omega as "-o mega".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d77f0159f9a6c0cf09739af805d46b05b4d5b2b..9150d39848fc3f57a58d093a5ca7f8e175c075bf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-28  Jes Bodi Klinke  <jes@bodi-klinke.dk>
+
+       * progmodes/compile.el (compilation-mode-font-lock-keywords):
+       Don't confuse -omega as "-o mega".
+
 2010-10-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc/log-edit.el (log-edit-rewrite-fixes): New var.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index a335f3dd427f8166dabd34c9b9be0edbf7446f1a..dd30212085edd900371f89cebf06c0382e168117 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -543,7 +543,7 @@ you may also want to change `compilation-page-delimiter'.")
      ;; Command output lines.  Recognize `make[n]:' lines too.
      ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
       (1 font-lock-function-name-face) (3 compilation-line-face nil t))
-     (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)
+     (" -\\(?:o[= ]?\\|-\\(?:outfile\\|output\\)[= ]\\)\\(\\S +\\)" . 1)
      ("^Compilation \\(finished\\).*"
       (0 '(face nil message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face))