* 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.
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.
("^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.
(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))))
'(("^ \\(.+\\) |" 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
(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)))