[Emacs-diffs] /srv/bzr/emacs/trunk r105134: * progmodes/compile.el (compilation-error-regexp-alist-alist):

[Johan Bockgård]

------------------------------------------------------------
revno: 105134
fixes bug(s): http://debbugs.gnu.org/2490
committer: Johan Bockgård <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-12 16:40:56 +0200
message:
  * progmodes/compile.el (compilation-error-regexp-alist-alist):
  Fix previous fix.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-12 13:37:38 +0000
+++ b/lisp/ChangeLog    2011-07-12 14:40:56 +0000
@@ -1,3 +1,8 @@
+2011-07-12  Johan Bockgård  <address@hidden>
+
+       * progmodes/compile.el (compilation-error-regexp-alist-alist):
+       Fix previous fix (bug#2490).
+
 2011-07-12  Roland Winkler  <address@hidden>
 
        * textmodes/bibtex.el (bibtex-initialize): Use

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-07-12 12:28:35 +0000
+++ b/lisp/progmodes/compile.el 2011-07-12 14:40:56 +0000
@@ -251,9 +251,9 @@
 \\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\
 \\([0-9]+\\)\\(?:[.:]\\([0-9]+\\)\\)?\
 \\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\
-\\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\|[Ee]rror\\)\\|\
+\\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
  *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
-\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
+ *[Ee]rror\\|\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 4) (3 . 5) (6 . 7))
 
     (lcc