[Emacs-diffs] /srv/bzr/emacs/trunk r106340: * lisp/progmodes/compile.el: Adjust regexp for OCaml warnings.

[Stefan Monnier]

------------------------------------------------------------
revno: 106340
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9749
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-09 10:39:32 -0500
message:
  * lisp/progmodes/compile.el: Adjust regexp for OCaml warnings.
  (compilation-error-regexp-alist-alist): OCaml warnings (can?) have a number.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el
  test/automated/compile-tests.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-09 15:10:25 +0000
+++ b/lisp/ChangeLog    2011-11-09 15:39:32 +0000
@@ -1,5 +1,8 @@
 2011-11-09  Stefan Monnier  <address@hidden>
 
+       * progmodes/compile.el (compilation-error-regexp-alist-alist):
+       Adjust regexp for OCaml warnings.
+
        * electric.el (electric-pair-post-self-insert-function): Let user
        turn it off buffer-locally (bug#9932).
 

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-11-09 14:04:13 +0000
+++ b/lisp/progmodes/compile.el 2011-11-09 15:39:32 +0000
@@ -157,7 +157,7 @@
 
     (python-tracebacks-and-caml
      "^[ \t]*File \\(\"?\\)\\([^,\" \n\t<>]+\\)\\1, lines? 
\\([0-9]+\\)-?\\([0-9]+\\)?\\(?:$\\|,\
-\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning:\\)?\\)"
+\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning\\(?: 
[0-9]+\\)?:\\)?\\)"
      2 (3 . 4) (5 . 6) (7))
 
     (comma

=== modified file 'test/automated/compile-tests.el'
--- a/test/automated/compile-tests.el   2011-05-09 01:22:05 +0000
+++ b/test/automated/compile-tests.el   2011-11-09 15:39:32 +0000
@@ -71,7 +71,7 @@
     ;; caml
     ("File \"foobar.ml\", lines 5-8, characters 20-155: blah blah"
      1 (19 . 155) (5 . 8) "foobar.ml")
-    ("File \"F:\\ocaml\\sorting.ml\", line 65, characters 2-145:"
+    ("File \"F:\\ocaml\\sorting.ml\", line 65, characters 2-145:\nWarning 26: 
unused variable equ."
      1 (1 . 145) 65 "F:\\ocaml\\sorting.ml")
     ("File \"/usr/share/gdesklets/display/TargetGauge.py\", line 41, in 
add_children"
      1 nil 41 "/usr/share/gdesklets/display/TargetGauge.py")