* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Rename

`caml' to `python-tracebacks-and-caml'; allow leading tabs.

Fixes: debbugs:8585

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 526f22ca67941d3ab2352999ac8808bff64f09ad..66fa971f721c1e30a807e475752efb3699f8f5f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,13 @@
+2011-06-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/compile.el (compilation-error-regexp-alist-alist): Rename
+       `caml' to `python-tracebacks-and-caml'; allow leading tabs (bug#8585).
+
 2011-06-21  Drew Adams <drew.adams@oracle.com>
 
        * menu-bar.el: Use function variable instead of switch-to-buffer.
        (menu-bar-select-buffer-function): New variable.
-       (menu-bar-update-buffers): Use it.
+       (menu-bar-update-buffers): Use it (bug#8876).
 
 2011-06-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -18,15 +23,16 @@
 
 2011-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * minibuffer.el (completion-metadata): Prepend the alist with `metadata'.
+       * minibuffer.el (completion-metadata): Add `metadata' to the alist.
        (completion-try-completion, completion-all-completions): Compute the
        metadata argument if it's missing; make it optional (bug#8795).
 
-       * wid-edit.el: Use lexical scoping and move towards completion-at-point.
+       * wid-edit.el: Use lex-bind and move towards completion-at-point.
        (widget-complete): Use new :completion-function property.
        (widget-completions-at-point): New function.
        (default): Use :completion-function instead of :complete.
-       (widget-default-completions): Rename from widget-default-complete, rewrite.
+       (widget-default-completions): Rename from widget-default-complete;
+       Rewrite.
        (widget-string-complete, widget-file-complete, widget-color-complete):
        Remove functions.
        (file, symbol, function, variable, coding-system, color):

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index b8cac2fd3310538a507cdbc9d76fa12762845818..1a23cd112af4297c65d76abc735433c69649c7a0 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -155,8 +155,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\([a-zA-Z]?:?[^:( \t\n]+\\)\
  \\([0-9]+\\)\\(?:[) \t]\\|:[^0-9\n]\\)" 2 3 nil (1))
 
-    (caml
-     "^ *File \\(\"?\\)\\([^,\" \n\t<>]+\\)\\1, lines? \\([0-9]+\\)-?\\([0-9]+\\)?\\(?:$\\|,\
+    (python-tracebacks-and-caml
+     "^[ \t]*File \\(\"?\\)\\([^,\" \n\t<>]+\\)\\1, lines? \\([0-9]+\\)-?\\([0-9]+\\)?\\(?:$\\|,\
 \\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning:\\)?\\)"
      2 (3 . 4) (5 . 6) (7))