diff options
| author | Johan Bockgård | 2011-07-12 16:40:56 +0200 |
|---|---|---|
| committer | Johan Bockgård | 2011-07-12 16:40:56 +0200 |
| commit | c79598ef31da0b1f93d0cfb311e2cc93342f976e (patch) | |
| tree | fed91b7712f1d6b053dc1fc627422c9614b40ffd | |
| parent | ff8be6ef0717b99cbfa4a3208417af5b86917807 (diff) | |
| download | emacs-c79598ef31da0b1f93d0cfb311e2cc93342f976e.tar.gz emacs-c79598ef31da0b1f93d0cfb311e2cc93342f976e.zip | |
* progmodes/compile.el (compilation-error-regexp-alist-alist):
Fix previous fix.
Fixes: debbugs:2490
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4334e18a38..7a9e0267c3e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-12 Johan Bockgård <bojohan@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-error-regexp-alist-alist): | ||
| 4 | Fix previous fix (bug#2490). | ||
| 5 | |||
| 1 | 2011-07-12 Roland Winkler <winkler@gnu.org> | 6 | 2011-07-12 Roland Winkler <winkler@gnu.org> |
| 2 | 7 | ||
| 3 | * textmodes/bibtex.el (bibtex-initialize): Use | 8 | * textmodes/bibtex.el (bibtex-initialize): Use |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index d9316764895..503698f0f7b 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -251,9 +251,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) | |||
| 251 | \\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\ | 251 | \\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\ |
| 252 | \\([0-9]+\\)\\(?:[.:]\\([0-9]+\\)\\)?\ | 252 | \\([0-9]+\\)\\(?:[.:]\\([0-9]+\\)\\)?\ |
| 253 | \\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\ | 253 | \\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\ |
| 254 | \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\|[Ee]rror\\)\\|\ | 254 | \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\ |
| 255 | *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\ | 255 | *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\ |
| 256 | \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" | 256 | *[Ee]rror\\|\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" |
| 257 | 1 (2 . 4) (3 . 5) (6 . 7)) | 257 | 1 (2 . 4) (3 . 5) (6 . 7)) |
| 258 | 258 | ||
| 259 | (lcc | 259 | (lcc |