aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-11 22:45:42 -0700
committerGlenn Morris2013-09-11 22:45:42 -0700
commit96b3f75a809761389cbbdc2eb0ed85f4559a8eef (patch)
tree94d7869fd228b3ea3ed9d20f633e4631733ee0e8
parent08d664200f0a49b15c2b17a673f1b10881d109fa (diff)
downloademacs-96b3f75a809761389cbbdc2eb0ed85f4559a8eef.tar.gz
emacs-96b3f75a809761389cbbdc2eb0ed85f4559a8eef.zip
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.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc/vc-bzr.el7
-rw-r--r--lisp/vc/vc-git.el4
3 files changed, 13 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cca32a55c4..beeb53d5c31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12013-09-12 Glenn Morris <rgm@gnu.org> 12013-09-12 Glenn Morris <rgm@gnu.org>
2 2
3 * vc/vc-bzr.el (vc-exec-after): Remove unused declaration.
4 (vc-compilation-mode): Declare.
5 (vc-bzr-pull): Require vc-dispatcher.
6 * vc/vc-git.el (vc-compilation-mode): Declare.
7 (vc-git-pull): Require vc-dispatcher.
8
3 * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Declare. 9 * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Declare.
4 10
5 * progmodes/octave.el (help-button-action): Declare. 11 * progmodes/octave.el (help-button-action): Declare.
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 5f5416dc2ff..3b8643e22f4 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -320,11 +320,9 @@ in the repository root directory of FILE."
320 ("^Using saved parent location: \\(.+\\)" 1 nil nil 0)) 320 ("^Using saved parent location: \\(.+\\)" 1 nil nil 0))
321 "Value of `compilation-error-regexp-alist' in *vc-bzr* buffers.") 321 "Value of `compilation-error-regexp-alist' in *vc-bzr* buffers.")
322 322
323;; Follows vc-bzr-(async-)command, which uses vc-do-(async-)command 323;; To be called via vc-pull from vc.el, which requires vc-dispatcher.
324;; from vc-dispatcher.
325(declare-function vc-exec-after "vc-dispatcher" (code))
326;; Follows vc-exec-after.
327(declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) 324(declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
325(declare-function vc-compilation-mode "vc-dispatcher" (backend))
328 326
329(defun vc-bzr-pull (prompt) 327(defun vc-bzr-pull (prompt)
330 "Pull changes into the current Bzr branch. 328 "Pull changes into the current Bzr branch.
@@ -354,6 +352,7 @@ prompt for the Bzr command to run."
354 (setq vc-bzr-program (car args) 352 (setq vc-bzr-program (car args)
355 command (cadr args) 353 command (cadr args)
356 args (cddr args))) 354 args (cddr args)))
355 (require 'vc-dispatcher)
357 (let ((buf (apply 'vc-bzr-async-command command args))) 356 (let ((buf (apply 'vc-bzr-async-command command args)))
358 (with-current-buffer buf (vc-run-delayed (vc-compilation-mode 'bzr))) 357 (with-current-buffer buf (vc-run-delayed (vc-compilation-mode 'bzr)))
359 (vc-set-async-update buf)))) 358 (vc-set-async-update buf))))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index a4ce3a2c46c..e730db17526 100644
--- 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.")
706 '(("^ \\(.+\\) |" 1 nil nil 0)) 706 '(("^ \\(.+\\) |" 1 nil nil 0))
707 "Value of `compilation-error-regexp-alist' in *vc-git* buffers.") 707 "Value of `compilation-error-regexp-alist' in *vc-git* buffers.")
708 708
709;; To be called via vc-pull from vc.el, which requires vc-dispatcher.
710(declare-function vc-compilation-mode "vc-dispatcher" (backend))
711
709(defun vc-git-pull (prompt) 712(defun vc-git-pull (prompt)
710 "Pull changes into the current Git branch. 713 "Pull changes into the current Git branch.
711Normally, this runs \"git pull\". If PROMPT is non-nil, prompt 714Normally, this runs \"git pull\". If PROMPT is non-nil, prompt
@@ -725,6 +728,7 @@ for the Git command to run."
725 (setq git-program (car args) 728 (setq git-program (car args)
726 command (cadr args) 729 command (cadr args)
727 args (cddr args))) 730 args (cddr args)))
731 (require 'vc-dispatcher)
728 (apply 'vc-do-async-command buffer root git-program command args) 732 (apply 'vc-do-async-command buffer root git-program command args)
729 (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'git))) 733 (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'git)))
730 (vc-set-async-update buffer))) 734 (vc-set-async-update buffer)))