merge from trunk

this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now

1 files changed, 6 insertions, 5 deletions

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 309cf50404c..4f4c6942ba9 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -385,14 +385,15 @@ Display the buffer in some window, but don't select it."
 
 (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.