From: Jes Bodi Klinke <jes@bodi-klinke.dk>
Date: Thu, 28 Oct 2010 01:10:22 +0000 (-0400)
Subject: * lisp/progmodes/compile.el (compilation-mode-font-lock-keywords):
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~433
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77b143ebc1100462cd6b9be6b92db91c35eb5f5d;p=emacs.git

* 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 8d77f0159f9..9150d39848f 100644
--- 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 a335f3dd427..dd30212085e 100644
--- 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))