[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114230: Silence some vc- compilation warnings
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114230: Silence some vc- compilation warnings |
Date: |
Thu, 12 Sep 2013 05:45:48 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114230
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-09-11 22:45:42 -0700
message:
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/vc-bzr.el vcbzr.el-20091113204419-o5vbwnq5f7feedwu-5055
lisp/vc/vc-git.el vcgit.el-20091113204419-o5vbwnq5f7feedwu-5070
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-09-12 05:43:55 +0000
+++ b/lisp/ChangeLog 2013-09-12 05:45:42 +0000
@@ -1,5 +1,11 @@
2013-09-12 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2013-09-04 21:09:42 +0000
+++ b/lisp/vc/vc-bzr.el 2013-09-12 05:45:42 +0000
@@ -320,11 +320,9 @@
("^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 @@
(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))))
=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2013-09-04 21:09:42 +0000
+++ b/lisp/vc/vc-git.el 2013-09-12 05:45:42 +0000
@@ -706,6 +706,9 @@
'(("^ \\(.+\\) |" 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 @@
(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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114230: Silence some vc- compilation warnings,
Glenn Morris <=