[Emacs-diffs] /srv/bzr/emacs/trunk r104650: * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Rename

[Stefan Monnier]

------------------------------------------------------------
revno: 104650
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8585
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-06-20 22:10:10 -0400
message:
  * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Rename
  `caml' to `python-tracebacks-and-caml'; allow leading tabs.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-21 01:49:36 +0000
+++ b/lisp/ChangeLog    2011-06-21 02:10:10 +0000
@@ -1,8 +1,13 @@
+2011-06-21  Stefan Monnier  <address@hidden>
+
+       * 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 <address@hidden>
 
        * 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  <address@hidden>
 
@@ -18,15 +23,16 @@
 
 2011-06-20  Stefan Monnier  <address@hidden>
 
-       * 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):

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-05-09 19:42:45 +0000
+++ b/lisp/progmodes/compile.el 2011-06-21 02:10:10 +0000
@@ -155,8 +155,8 @@
 \\([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))