[Emacs-diffs] trunk r112994: vc-compilation-mode fixes

[Glenn Morris]

------------------------------------------------------------
revno: 112994
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-14 19:50:47 -0700
message:
  vc-compilation-mode fixes
  
  * lisp/vc/vc-dispatcher.el (vc-compilation-mode): Avoid making
  compilation-error-regexp-alist void, or local while let-bound.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-dispatcher.el       
vcdispatcher.el-20091113204419-o5vbwnq5f7feedwu-8662

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-15 02:25:00 +0000
+++ b/lisp/ChangeLog    2013-06-15 02:50:47 +0000
@@ -1,5 +1,8 @@
 2013-06-15  Glenn Morris  <address@hidden>
 
+       * vc/vc-dispatcher.el (vc-compilation-mode): Avoid making
+       compilation-error-regexp-alist void, or local while let-bound.
+
        * progmodes/make-mode.el (makefile-mode-syntax-table):
        Treat "=" as punctuation.  (Bug#14614)
 

=== modified file 'lisp/vc/vc-dispatcher.el'
--- a/lisp/vc/vc-dispatcher.el  2013-04-20 16:24:04 +0000
+++ b/lisp/vc/vc-dispatcher.el  2013-06-15 02:50:47 +0000
@@ -385,14 +385,15 @@
 
 (defun vc-compilation-mode (backend)
   "Setup `compilation-mode' after with the appropriate 
`compilation-error-regexp-alist'."
+  (require 'compile)
   (let* ((error-regexp-alist
           (vc-make-backend-sym backend 'error-regexp-alist))
-         (compilation-error-regexp-alist
-          (and (boundp error-regexp-alist)
-               (symbol-value error-regexp-alist))))
-    (compilation-mode)
+        (error-regexp-alist (and (boundp error-regexp-alist)
+                                 (symbol-value error-regexp-alist))))
+    (let ((compilation-error-regexp-alist error-regexp-alist))
+      (compilation-mode))
     (set (make-local-variable 'compilation-error-regexp-alist)
-         compilation-error-regexp-alist)))
+        error-regexp-alist)))
 
 (defun vc-set-async-update (process-buffer)
   "Set a `vc-exec-after' action appropriate to the current buffer.