aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksei Gusev2010-07-10 15:47:59 -0400
committerChong Yidong2010-07-10 15:47:59 -0400
commitdce3463576bc49f60793cc4b8dc33c04c88ed256 (patch)
treebe2d82a6f9f34c324f063109377edc07902c69b7
parent7ac1c664547ca88fd6c0ff65ef5e780b1c5efcb0 (diff)
downloademacs-dce3463576bc49f60793cc4b8dc33c04c88ed256.tar.gz
emacs-dce3463576bc49f60793cc4b8dc33c04c88ed256.zip
Add compilation regexps for cucumber and ruby.
* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Add regexps for cucumber and ruby.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/cl-loaddefs.el2
-rw-r--r--lisp/progmodes/compile.el13
3 files changed, 18 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01ecaab86b6..fc5e087529e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-07-10 Aleksei Gusev <aleksei.gusev@gmail.com> (tiny change)
2
3 * progmodes/compile.el (compilation-error-regexp-alist-alist): Add
4 regexps for cucumber and ruby.
5
12010-07-08 Daiki Ueno <ueno@unixuser.org> 62010-07-08 Daiki Ueno <ueno@unixuser.org>
2 7
3 * epa-file.el (epa-file-error, epa-file--find-file-not-found-function) 8 * epa-file.el (epa-file-error, epa-file--find-file-not-found-function)
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index ff0fa599985..b14c879fcf7 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
282;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist 282;;;;;; flet progv psetq do-all-symbols do-symbols dotimes dolist
283;;;;;; do* do loop return-from return block etypecase typecase ecase 283;;;;;; do* do loop return-from return block etypecase typecase ecase
284;;;;;; case load-time-value eval-when destructuring-bind function* 284;;;;;; case load-time-value eval-when destructuring-bind function*
285;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "49b7d96626dd8ba5d39551909edbd4c7") 285;;;;;; defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "36cafd5054969b5bb0b1ce6a21605fed")
286;;; Generated autoloads from cl-macs.el 286;;; Generated autoloads from cl-macs.el
287 287
288(autoload 'gensym "cl-macs" "\ 288(autoload 'gensym "cl-macs" "\
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 7000b4bbc8a..76bd02615e3 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -196,6 +196,10 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
196 "^\"\\([^,\" \n\t]+\\)\", line \\([0-9]+\\)\ 196 "^\"\\([^,\" \n\t]+\\)\", line \\([0-9]+\\)\
197\\(?:[(. pos]+\\([0-9]+\\))?\\)?[:.,; (-]\\( warning:\\|[-0-9 ]*(W)\\)?" 1 2 3 (4)) 197\\(?:[(. pos]+\\([0-9]+\\))?\\)?[:.,; (-]\\( warning:\\|[-0-9 ]*(W)\\)?" 1 2 3 (4))
198 198
199 (cucumber
200 "\\(?:^cucumber\\(?: -p [^[:space:]]+\\)?\\|#\\)\
201\\(?: \\)\\([^\(].*\\):\\([1-9][0-9]*\\)" 1 2)
202
199 (edg-1 203 (edg-1
200 "^\\([^ \n]+\\)(\\([0-9]+\\)): \\(?:error\\|warnin\\(g\\)\\|remar\\(k\\)\\)" 204 "^\\([^ \n]+\\)(\\([0-9]+\\)): \\(?:error\\|warnin\\(g\\)\\|remar\\(k\\)\\)"
201 1 2 nil (3 . 4)) 205 1 2 nil (3 . 4))
@@ -325,6 +329,13 @@ during global destruction\\.$\\)" 1 2)
325 "\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)" 329 "\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)"
326 2 3 nil nil) 330 2 3 nil nil)
327 331
332 (ruby
333 "^[\t ]*\\(?:from \\)?\
334\\([^\(\n][^[:space:]\n]*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?.*$" 1 2)
335
336 (ruby-Test::Unit
337 "[\t ]*\\[\\([^\(].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:$" 1 2)
338
328 (rxp 339 (rxp
329 "^\\(?:Error\\|Warnin\\(g\\)\\):.*\n.* line \\([0-9]+\\) char\ 340 "^\\(?:Error\\|Warnin\\(g\\)\\):.*\n.* line \\([0-9]+\\) char\
330 \\([0-9]+\\) of file://\\(.+\\)" 341 \\([0-9]+\\) of file://\\(.+\\)"
@@ -2083,7 +2094,7 @@ and overlay is highlighted between MK and END-MK."
2083 pre-existing 2094 pre-existing
2084 (let ((display-buffer-reuse-frames t) 2095 (let ((display-buffer-reuse-frames t)
2085 (pop-up-windows t)) 2096 (pop-up-windows t))
2086 ;; Pop up a window. 2097 ;; Pop up a window.
2087 (display-buffer (marker-buffer msg))))) 2098 (display-buffer (marker-buffer msg)))))
2088 (highlight-regexp (with-current-buffer (marker-buffer msg) 2099 (highlight-regexp (with-current-buffer (marker-buffer msg)
2089 ;; also do this while we change buffer 2100 ;; also do this while we change buffer