[Emacs-diffs] /srv/bzr/emacs/trunk r101337: Fix Ruby compilation error matching.

[Chong Yidong]

------------------------------------------------------------
revno: 101337
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-04 16:42:03 -0400
message:
  Fix Ruby compilation error matching.
  
  * progmodes/compile.el (compilation-error-regexp-alist-alist):
  Remove ruby regexp; handle Ruby errors with gcc-include and gnu.
  Recognize leading tab in gcc-include regexp.  Ignore names with
  leading "from" or "in" in gnu regexp (Bug#6937).
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-04 18:47:29 +0000
+++ b/lisp/ChangeLog    2010-09-04 20:42:03 +0000
@@ -1,3 +1,10 @@
+2010-09-04  Chong Yidong  <address@hidden>
+
+       * progmodes/compile.el (compilation-error-regexp-alist-alist):
+       Remove ruby regexp; handle Ruby errors with gcc-include and gnu.
+       Recognize leading tab in gcc-include regexp.  Ignore names with
+       leading "from" or "in" in gnu regexp (Bug#6937).
+
 2010-09-04  Stefan Monnier  <address@hidden>
 
        Avoid global recursive calls to kill-buffer-hooks, and fit into 80 cols.

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2010-08-15 00:04:53 +0000
+++ b/lisp/progmodes/compile.el 2010-09-04 20:42:03 +0000
@@ -227,10 +227,6 @@
      "^[-[:alnum:]_/ ]+: 
\\(?:\\(?:[sS]evere\\|[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*: 
\\)?\
 \\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2))
 
-    (ruby
-     "^[\t ]*\\(?:from \\)?\
-\\([^\(\n][^[:space:]\n]*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?.*$" 1 2)
-
     (java
      "^\\(?:[ \t]+at \\|==[0-9]+== 
+\\(?:at\\|b\\(y\\)\\)\\).+(\\([^()\n]+\\):\\([0-9]+\\))$" 2 3 nil (1))
 
@@ -241,6 +237,10 @@
      nil 1 nil 2 0
      (2 (compilation-face '(3))))
 
+    (gcc-include
+     "^\\(?:In file included \\|                 \\|\t\\)from \
+\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\|$\\)\\)?" 1 2 nil (3 . 4))
+
     (gnu
      ;; The first line matches the program name for
 
@@ -264,7 +264,7 @@
      ;; can be composed of any non-newline char, but it also rules out some
      ;; valid but unlikely cases, such as a trailing space or a space
      ;; followed by a -.
-     "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\)?\
+     "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\|[ \t]+\\(?:in \\|from \\)\\)?\
 \\([0-9]*[^0-9\n]\\(?:[^\n ]\\| [^-/\n]\\)*?\\): ?\
 \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\
 \\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\
@@ -273,12 +273,6 @@
 \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 5) (4 . 6) (7 . 8))
 
-    ;; The `gnu' style above can incorrectly match gcc's "In file
-    ;; included from" message, so we process that first. -- cyd
-    (gcc-include
-     "^\\(?:In file included\\|                \\) from \
-\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4))
-
     (lcc
      "^\\(?:E\\|\\(W\\)\\), \\([^(\n]+\\)(\\([0-9]+\\),[ \t]*\\([0-9]+\\)"
      2 3 4 (1))