diff options
| author | Chong Yidong | 2010-08-14 20:04:53 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-08-14 20:04:53 -0400 |
| commit | c68263b1fd5dc4e5818394ec77368bf11ca2767e (patch) | |
| tree | f9ce01747e07aa0b59707b81bd1316b69fe6e96c /lisp | |
| parent | 456f369a38e7223cca895b802c9c4e86480bf42e (diff) | |
| download | emacs-c68263b1fd5dc4e5818394ec77368bf11ca2767e.tar.gz emacs-c68263b1fd5dc4e5818394ec77368bf11ca2767e.zip | |
Give Ruby compilation rule a lower priority than Gnu (Bug#6778).
* progmodes/compile.el (compilation-error-regexp-alist-alist):
Give the Ruby rule a lower priority than Gnu (Bug#6778).
* etc/compilation.txt: Make Cucumber test less verbose.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2f68ba7677..bc1bcac7191 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-08-15 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-error-regexp-alist-alist): | ||
| 4 | Give the Ruby rule a lower priority than Gnu (Bug#6778). | ||
| 5 | |||
| 1 | 2010-08-14 Štěpán Němec <stepnem@gmail.com> (tiny change) | 6 | 2010-08-14 Štěpán Němec <stepnem@gmail.com> (tiny change) |
| 2 | 7 | ||
| 3 | * font-lock.el (lisp-font-lock-keywords-2): Add | 8 | * font-lock.el (lisp-font-lock-keywords-2): Add |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index c92d6a9f052..a909006e0c0 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -227,6 +227,10 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) | |||
| 227 | "^[-[:alnum:]_/ ]+: \\(?:\\(?:[sS]evere\\|[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*: \\)?\ | 227 | "^[-[:alnum:]_/ ]+: \\(?:\\(?:[sS]evere\\|[eE]rror\\|[wW]arnin\\(g\\)\\|[iI]nf\\(o\\)\\)[0-9 ]*: \\)?\ |
| 228 | \\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2)) | 228 | \\([^,\" \n\t]+\\)\\(?:, line\\|:\\) \\([0-9]+\\):" 3 4 nil (1 . 2)) |
| 229 | 229 | ||
| 230 | (ruby | ||
| 231 | "^[\t ]*\\(?:from \\)?\ | ||
| 232 | \\([^\(\n][^[:space:]\n]*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?.*$" 1 2) | ||
| 233 | |||
| 230 | (java | 234 | (java |
| 231 | "^\\(?:[ \t]+at \\|==[0-9]+== +\\(?:at\\|b\\(y\\)\\)\\).+(\\([^()\n]+\\):\\([0-9]+\\))$" 2 3 nil (1)) | 235 | "^\\(?:[ \t]+at \\|==[0-9]+== +\\(?:at\\|b\\(y\\)\\)\\).+(\\([^()\n]+\\):\\([0-9]+\\))$" 2 3 nil (1)) |
| 232 | 236 | ||
| @@ -329,10 +333,6 @@ during global destruction\\.$\\)" 1 2) | |||
| 329 | "\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)" | 333 | "\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)" |
| 330 | 2 3 nil nil) | 334 | 2 3 nil nil) |
| 331 | 335 | ||
| 332 | (ruby | ||
| 333 | "^[\t ]*\\(?:from \\)?\ | ||
| 334 | \\([^\(\n][^[:space:]\n]*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?.*$" 1 2) | ||
| 335 | |||
| 336 | (ruby-Test::Unit | 336 | (ruby-Test::Unit |
| 337 | "[\t ]*\\[\\([^\(].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:$" 1 2) | 337 | "[\t ]*\\[\\([^\(].*\\):\\([1-9][0-9]*\\)\\(\\]\\)?:$" 1 2) |
| 338 | 338 | ||