diff options
| author | Stefan Monnier | 2006-07-19 19:20:11 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-07-19 19:20:11 +0000 |
| commit | 0ab31e4a9ffda94e1e741f9a4b0df5aff3c62570 (patch) | |
| tree | 6ed3135abde271dfc50b3a99af2ce23c76f966e0 | |
| parent | ee87a9f988413752768d028090f32c2ae93774a8 (diff) | |
| download | emacs-0ab31e4a9ffda94e1e741f9a4b0df5aff3c62570.tar.gz emacs-0ab31e4a9ffda94e1e741f9a4b0df5aff3c62570.zip | |
(compilation-error-regexp-alist-alist) <gnu>:
Try to rule out false positives due to time stamps.
(compilation-mode-font-lock-keywords): Remove rules made redundant
because of the above change. Add `segmentation fault' to the known and
highlighted compilation termination messages.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5d661248832..b99fffcf5db 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2006-07-19 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-error-regexp-alist-alist) <gnu>: | ||
| 4 | Try to rule out false positives due to time stamps. | ||
| 5 | (compilation-mode-font-lock-keywords): Remove rules made redundant | ||
| 6 | because of the above change. Add `segmentation fault' to the known and | ||
| 7 | highlighted compilation termination messages. | ||
| 8 | |||
| 1 | 2006-07-19 Kim F. Storm <storm@cua.dk> | 9 | 2006-07-19 Kim F. Storm <storm@cua.dk> |
| 2 | 10 | ||
| 3 | * progmodes/grep.el (grep-find-ignored-directories): | 11 | * progmodes/grep.el (grep-find-ignored-directories): |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 525c462d4eb..e8c09113d39 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -226,14 +226,19 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) | |||
| 226 | ;; I have no idea what this first line is supposed to match, but it | 226 | ;; I have no idea what this first line is supposed to match, but it |
| 227 | ;; makes things ambiguous with output such as "foo:344:50:blabla" since | 227 | ;; makes things ambiguous with output such as "foo:344:50:blabla" since |
| 228 | ;; the "foo" part can match this first line (in which case the file | 228 | ;; the "foo" part can match this first line (in which case the file |
| 229 | ;; name as "344"). To avoid this, we disallow filenames exclusively | 229 | ;; name as "344"). To avoid this, the second line disallows filenames |
| 230 | ;; composed of digits. --Stef | 230 | ;; exclusively composed of digits. --Stef |
| 231 | ;; Similarly, we get lots of false positives with messages including | ||
| 232 | ;; times of the form "HH:MM:SS" where MM is taken as a line number, so | ||
| 233 | ;; the last line tries to rule out message where the info after the | ||
| 234 | ;; line number starts with "SS". --Stef | ||
| 231 | "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\ | 235 | "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\ |
| 232 | \\([0-9]*[^0-9\n].*?\\): ?\ | 236 | \\([0-9]*[^0-9\n].*?\\): ?\ |
| 233 | \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\ | 237 | \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\ |
| 234 | \\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\ | 238 | \\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\ |
| 235 | \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\ | 239 | \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\ |
| 236 | *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\)?" | 240 | *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\|\ |
| 241 | \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" | ||
| 237 | 1 (2 . 5) (4 . 6) (7 . 8)) | 242 | 1 (2 . 5) (4 . 6) (7 . 8)) |
| 238 | 243 | ||
| 239 | (lcc | 244 | (lcc |
| @@ -405,12 +410,7 @@ you may also want to change `compilation-page-delimiter'.") | |||
| 405 | "Value of `page-delimiter' in Compilation mode.") | 410 | "Value of `page-delimiter' in Compilation mode.") |
| 406 | 411 | ||
| 407 | (defvar compilation-mode-font-lock-keywords | 412 | (defvar compilation-mode-font-lock-keywords |
| 408 | '(;; Don't highlight this as a compilation message. | 413 | '(;; configure output lines. |
| 409 | ("^Compilation started at.*" | ||
| 410 | (0 '(face nil message nil help-echo nil mouse-face nil) t)) | ||
| 411 | ("^Compiling file .*" | ||
| 412 | (0 '(face nil message nil help-echo nil mouse-face nil) t)) | ||
| 413 | ;; configure output lines. | ||
| 414 | ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$" | 414 | ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$" |
| 415 | (1 font-lock-variable-name-face) | 415 | (1 font-lock-variable-name-face) |
| 416 | (2 (compilation-face '(4 . 3)))) | 416 | (2 (compilation-face '(4 . 3)))) |
| @@ -421,7 +421,7 @@ you may also want to change `compilation-page-delimiter'.") | |||
| 421 | ("^Compilation \\(finished\\).*" | 421 | ("^Compilation \\(finished\\).*" |
| 422 | (0 '(face nil message nil help-echo nil mouse-face nil) t) | 422 | (0 '(face nil message nil help-echo nil mouse-face nil) t) |
| 423 | (1 compilation-info-face)) | 423 | (1 compilation-info-face)) |
| 424 | ("^Compilation \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*" | 424 | ("^Compilation \\(exited abnormally\\|interrupt\\|killed\\|terminated\\|segmentation fault\\)\\(?:.*with code \\([0-9]+\\)\\)?.*" |
| 425 | (0 '(face nil message nil help-echo nil mouse-face nil) t) | 425 | (0 '(face nil message nil help-echo nil mouse-face nil) t) |
| 426 | (1 compilation-error-face) | 426 | (1 compilation-error-face) |
| 427 | (2 compilation-error-face nil t))) | 427 | (2 compilation-error-face nil t))) |