* lisp/progmodes/compile.el: Adjust regexp for OCaml warnings.

(compilation-error-regexp-alist-alist): OCaml warnings (can?) have a number.

Fixes: debbugs:9749

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f00ef7077637cb0d6dfa6081043f0c2faf4b817..d7501d14f8de0a0915ef28b2a7f60e80780e000e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * 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).
 

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 491d5c756718dab3d0fcba4c27ec615411fe3fd0..3dba1af515a295f968bdd3cf301a09169a548ee7 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -157,7 +157,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 
     (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

diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el
index 1d9a266904c16bddfff45d86c7671e3ec1b249c3..419cc0e91167d4f0693917e2def8c5591d9a7597 100644 (file)
--- a/test/automated/compile-tests.el
+++ b/test/automated/compile-tests.el
@@ -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")