Silence some vc- compilation warnings

* vc/vc-bzr.el (vc-exec-after): Remove unused declaration.
(vc-compilation-mode): Declare.
(vc-bzr-pull): Require vc-dispatcher.

* vc/vc-git.el (vc-compilation-mode): Declare.
(vc-git-pull): Require vc-dispatcher.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cca32a55c4380fe33c0ec3b0707ee591d499f3b..beeb53d5c31a9975b089846e5ec314ca12820460 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2013-09-12  Glenn Morris  <rgm@gnu.org>
 
+       * vc/vc-bzr.el (vc-exec-after): Remove unused declaration.
+       (vc-compilation-mode): Declare.
+       (vc-bzr-pull): Require vc-dispatcher.
+       * vc/vc-git.el (vc-compilation-mode): Declare.
+       (vc-git-pull): Require vc-dispatcher.
+
        * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Declare.
 
        * progmodes/octave.el (help-button-action): Declare.

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 5f5416dc2ff6049240c7d8704e7698898e450b5e..3b8643e22f4086aa9720ad9f2713e05da3e6bf7b 100644 (file)
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -320,11 +320,9 @@ in the repository root directory of FILE."
     ("^Using saved parent location: \\(.+\\)" 1 nil nil 0))
   "Value of `compilation-error-regexp-alist' in *vc-bzr* buffers.")
 
-;; Follows vc-bzr-(async-)command, which uses vc-do-(async-)command
-;; from vc-dispatcher.
-(declare-function vc-exec-after "vc-dispatcher" (code))
-;; Follows vc-exec-after.
+;; To be called via vc-pull from vc.el, which requires vc-dispatcher.
 (declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
+(declare-function vc-compilation-mode "vc-dispatcher" (backend))
 
 (defun vc-bzr-pull (prompt)
   "Pull changes into the current Bzr branch.
@@ -354,6 +352,7 @@ prompt for the Bzr command to run."
       (setq vc-bzr-program (car  args)
            command        (cadr args)
            args           (cddr args)))
+    (require 'vc-dispatcher)
     (let ((buf (apply 'vc-bzr-async-command command args)))
       (with-current-buffer buf (vc-run-delayed (vc-compilation-mode 'bzr)))
       (vc-set-async-update buf))))

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index a4ce3a2c46c373ea2e75f0353bade918cf5d384d..e730db1752656a5797ed48e7c589dbf6a3f01165 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -706,6 +706,9 @@ It is based on `log-edit-mode', and has Git-specific extensions.")
   '(("^ \\(.+\\) |" 1 nil nil 0))
   "Value of `compilation-error-regexp-alist' in *vc-git* buffers.")
 
+;; To be called via vc-pull from vc.el, which requires vc-dispatcher.
+(declare-function vc-compilation-mode "vc-dispatcher" (backend))
+
 (defun vc-git-pull (prompt)
   "Pull changes into the current Git branch.
 Normally, this runs \"git pull\".  If PROMPT is non-nil, prompt
@@ -725,6 +728,7 @@ for the Git command to run."
       (setq git-program (car  args)
            command     (cadr args)
            args        (cddr args)))
+    (require 'vc-dispatcher)
     (apply 'vc-do-async-command buffer root git-program command args)
     (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'git)))
     (vc-set-async-update buffer)))