[Emacs-diffs] /srv/bzr/emacs/trunk r100771: Add compilation regexps for cucumber and ruby.

[Chong Yidong]

------------------------------------------------------------
revno: 100771
author: Aleksei Gusev <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-07-10 15:47:59 -0400
message:
  Add compilation regexps for cucumber and ruby.
  
  * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Add
  regexps for cucumber and ruby.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-loaddefs.el
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-10 18:52:53 +0000
+++ b/lisp/ChangeLog    2010-07-10 19:47:59 +0000
@@ -1,3 +1,8 @@
+2010-07-10  Aleksei Gusev  <address@hidden>  (tiny change)
+
+       * progmodes/compile.el (compilation-error-regexp-alist-alist): Add
+       regexps for cucumber and ruby.
+
 2010-07-08  Daiki Ueno  <address@hidden>
 
        * epa-file.el (epa-file-error, epa-file--find-file-not-found-function)

=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el    2010-07-10 18:52:53 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el    2010-07-10 19:47:59 +0000
@@ -282,7 +282,7 @@
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" 
"49b7d96626dd8ba5d39551909edbd4c7")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" 
"36cafd5054969b5bb0b1ce6a21605fed")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2010-05-08 20:51:08 +0000
+++ b/lisp/progmodes/compile.el 2010-07-10 19:47:59 +0000
@@ -196,6 +196,10 @@
      "^\"\\([^,\" \n\t]+\\)\", line \\([0-9]+\\)\
 \\(?:[(. pos]+\\([0-9]+\\))?\\)?[:.,; (-]\\( warning:\\|[-0-9 ]*(W)\\)?" 1 2 3 
(4))
 
+    (cucumber
+     "\\(?:^cucumber\\(?: -p [^[:space:]]+\\)?\\|#\\)\
+\\(?: \\)\\([^\(].*\\):\\([1-9][0-9]*\\)" 1 2)
+
     (edg-1
      "^\\([^ \n]+\\)(\\([0-9]+\\)): 
\\(?:error\\|warnin\\(g\\)\\|remar\\(k\\)\\)"
      1 2 nil (3 . 4))
@@ -325,6 +329,13 @@
      "\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)"
      2 3 nil nil)
 
+    (ruby
+     "^[\t ]*\\(?:from \\)?\
+\\([^\(\n][^[:space:]\n]*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?.*$" 1 2)
+
+    (ruby-Test::Unit
+     "[\t ]*\\[\\([^\(].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:$" 1 2)
+
     (rxp
      "^\\(?:Error\\|Warnin\\(g\\)\\):.*\n.* line \\([0-9]+\\) char\
  \\([0-9]+\\) of file://\\(.+\\)"
@@ -2083,7 +2094,7 @@
                 pre-existing
               (let ((display-buffer-reuse-frames t)
                     (pop-up-windows t))
-               ;; Pop up a window.
+               ;; Pop up a window.
                 (display-buffer (marker-buffer msg)))))
         (highlight-regexp (with-current-buffer (marker-buffer msg)
                             ;; also do this while we change buffer