diff options
| author | Jes Bodi Klinke | 2010-10-27 21:10:22 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-10-27 21:10:22 -0400 |
| commit | 77b143ebc1100462cd6b9be6b92db91c35eb5f5d (patch) | |
| tree | 38d31b38c7f0e2b0a37fa256a66dbeba89380865 | |
| parent | 11a5db4a62a5d29f9419db6658f818b9a4d499cc (diff) | |
| download | emacs-77b143ebc1100462cd6b9be6b92db91c35eb5f5d.tar.gz emacs-77b143ebc1100462cd6b9be6b92db91c35eb5f5d.zip | |
* lisp/progmodes/compile.el (compilation-mode-font-lock-keywords):
Don't confuse -omega as "-o mega".
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d77f0159f9..9150d39848f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-10-28 Jes Bodi Klinke <jes@bodi-klinke.dk> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-mode-font-lock-keywords): | ||
| 4 | Don't confuse -omega as "-o mega". | ||
| 5 | |||
| 1 | 2010-10-27 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-10-27 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc/log-edit.el (log-edit-rewrite-fixes): New var. | 8 | * 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'.") | |||
| 543 | ;; Command output lines. Recognize `make[n]:' lines too. | 543 | ;; Command output lines. Recognize `make[n]:' lines too. |
| 544 | ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:" | 544 | ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:" |
| 545 | (1 font-lock-function-name-face) (3 compilation-line-face nil t)) | 545 | (1 font-lock-function-name-face) (3 compilation-line-face nil t)) |
| 546 | (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1) | 546 | (" -\\(?:o[= ]?\\|-\\(?:outfile\\|output\\)[= ]\\)\\(\\S +\\)" . 1) |
| 547 | ("^Compilation \\(finished\\).*" | 547 | ("^Compilation \\(finished\\).*" |
| 548 | (0 '(face nil message nil help-echo nil mouse-face nil) t) | 548 | (0 '(face nil message nil help-echo nil mouse-face nil) t) |
| 549 | (1 compilation-info-face)) | 549 | (1 compilation-info-face)) |