diff options
| author | Glenn Morris | 2013-05-28 00:47:11 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-28 00:47:11 -0700 |
| commit | 712b9732db5ff6e38ac3f3960d69cb9a484add37 (patch) | |
| tree | 6167be6d7d77ef2a9279df2668d2b4b3a6f132d0 | |
| parent | f673190fb00e4b0e10db52c774a695e67b2eea50 (diff) | |
| download | emacs-712b9732db5ff6e38ac3f3960d69cb9a484add37.tar.gz emacs-712b9732db5ff6e38ac3f3960d69cb9a484add37.zip | |
Silence the rest of vc compilation
* vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff, vc-resynch-buffer):
Declare.
(vc-switches, vc-default-revert, vc-version-backup-file): Autoload.
* vc/vc-git.el (vc-exec-after, vc-set-async-update, grep-read-regexp)
(grep-read-files, grep-expand-template, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload.
* vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare.
(vc-setup-buffer, vc-switches, vc-do-async-command): Autoload.
* vc/vc-sccs.el (vc-file-tree-walk): Declare.
(vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify)
(vc-tag-precondition, vc-rename-master): Autoload.
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/vc/vc-cvs.el | 13 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 23 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 12 | ||||
| -rw-r--r-- | lisp/vc/vc-sccs.el | 12 |
5 files changed, 72 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index abb250ecc65..0a502543ef3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -6,12 +6,24 @@ | |||
| 6 | (vc-exec-after, vc-set-async-update, vc-default-dir-printer) | 6 | (vc-exec-after, vc-set-async-update, vc-default-dir-printer) |
| 7 | (vc-resynch-buffer, vc-dir-refresh): Declare. | 7 | (vc-resynch-buffer, vc-dir-refresh): Declare. |
| 8 | (vc-setup-buffer, vc-switches): Autoload. | 8 | (vc-setup-buffer, vc-switches): Autoload. |
| 9 | * vc/vc-cvs.el (vc-exec-after, vc-coding-system-for-diff) | ||
| 10 | (vc-resynch-buffer): Declare. | ||
| 11 | (vc-switches, vc-default-revert, vc-version-backup-file): Autoload. | ||
| 9 | * vc/vc-dir.el (desktop-missing-file-warning): Declare. | 12 | * vc/vc-dir.el (desktop-missing-file-warning): Declare. |
| 13 | * vc/vc-git.el (vc-exec-after, vc-set-async-update) | ||
| 14 | (grep-read-regexp, grep-read-files, grep-expand-template) | ||
| 15 | (vc-dir-refresh): Declare. | ||
| 16 | (vc-setup-buffer, vc-switches, vc-resynch-buffer): Autoload. | ||
| 17 | * vc/vc-hg.el (vc-exec-after, vc-set-async-update): Declare. | ||
| 18 | (vc-setup-buffer, vc-switches, vc-do-async-command): Autoload. | ||
| 10 | * vc/vc-mtn.el (vc-exec-after): Declare. | 19 | * vc/vc-mtn.el (vc-exec-after): Declare. |
| 11 | (vc-switches): Autoload. | 20 | (vc-switches): Autoload. |
| 12 | * vc/vc-rcs.el (vc-expand-dirs, vc-switches) | 21 | * vc/vc-rcs.el (vc-expand-dirs, vc-switches) |
| 13 | (vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload. | 22 | (vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload. |
| 14 | (vc-file-tree-walk): Declare. | 23 | (vc-file-tree-walk): Declare. |
| 24 | * vc/vc-sccs.el (vc-file-tree-walk): Declare. | ||
| 25 | (vc-expand-dirs, vc-switches, vc-setup-buffer, vc-delistify) | ||
| 26 | (vc-tag-precondition, vc-rename-master): Autoload. | ||
| 15 | * vc/vc-svn.el (vc-exec-after): Declare. | 27 | * vc/vc-svn.el (vc-exec-after): Declare. |
| 16 | (vc-switches, vc-setup-buffer): Autoload. | 28 | (vc-switches, vc-setup-buffer): Autoload. |
| 17 | * obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert): | 29 | * obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert): |
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 7a8f8107509..eee896056c6 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el | |||
| @@ -280,6 +280,8 @@ committed and support display of sticky tags." | |||
| 280 | ;;; State-changing functions | 280 | ;;; State-changing functions |
| 281 | ;;; | 281 | ;;; |
| 282 | 282 | ||
| 283 | (autoload 'vc-switches "vc") | ||
| 284 | |||
| 283 | (defun vc-cvs-register (files &optional _rev comment) | 285 | (defun vc-cvs-register (files &optional _rev comment) |
| 284 | "Register FILES into the CVS version-control system. | 286 | "Register FILES into the CVS version-control system. |
| 285 | COMMENT can be used to provide an initial description of FILES. | 287 | COMMENT can be used to provide an initial description of FILES. |
| @@ -415,6 +417,8 @@ REV is the revision to check out." | |||
| 415 | (defun vc-cvs-delete-file (file) | 417 | (defun vc-cvs-delete-file (file) |
| 416 | (vc-cvs-command nil 0 file "remove" "-f")) | 418 | (vc-cvs-command nil 0 file "remove" "-f")) |
| 417 | 419 | ||
| 420 | (autoload 'vc-default-revert "vc") | ||
| 421 | |||
| 418 | (defun vc-cvs-revert (file &optional contents-done) | 422 | (defun vc-cvs-revert (file &optional contents-done) |
| 419 | "Revert FILE to the working revision on which it was based." | 423 | "Revert FILE to the working revision on which it was based." |
| 420 | (vc-default-revert 'CVS file contents-done) | 424 | (vc-default-revert 'CVS file contents-done) |
| @@ -501,6 +505,8 @@ Will fail unless you have administrative privileges on the repo." | |||
| 501 | ;;; | 505 | ;;; |
| 502 | 506 | ||
| 503 | (declare-function vc-rcs-print-log-cleanup "vc-rcs" ()) | 507 | (declare-function vc-rcs-print-log-cleanup "vc-rcs" ()) |
| 508 | ;; Follows vc-cvs-command, which uses vc-do-command from vc-dispatcher. | ||
| 509 | (declare-function vc-exec-after "vc-dispatcher" (code)) | ||
| 504 | 510 | ||
| 505 | (defun vc-cvs-print-log (files buffer &optional _shortlog _start-revision limit) | 511 | (defun vc-cvs-print-log (files buffer &optional _shortlog _start-revision limit) |
| 506 | "Print commit log associated with FILES into specified BUFFER. | 512 | "Print commit log associated with FILES into specified BUFFER. |
| @@ -519,6 +525,9 @@ Remaining arguments are ignored." | |||
| 519 | "Get comment history of a file." | 525 | "Get comment history of a file." |
| 520 | (vc-call-backend 'RCS 'comment-history file)) | 526 | (vc-call-backend 'RCS 'comment-history file)) |
| 521 | 527 | ||
| 528 | (autoload 'vc-version-backup-file "vc") | ||
| 529 | (declare-function vc-coding-system-for-diff "vc" (file)) | ||
| 530 | |||
| 522 | (defun vc-cvs-diff (files &optional oldvers newvers buffer) | 531 | (defun vc-cvs-diff (files &optional oldvers newvers buffer) |
| 523 | "Get a difference report using CVS between two revisions of FILE." | 532 | "Get a difference report using CVS between two revisions of FILE." |
| 524 | (let* (process-file-side-effects | 533 | (let* (process-file-side-effects |
| @@ -665,6 +674,10 @@ workspace is immediately moved to that new branch)." | |||
| 665 | (vc-cvs-command nil 0 dir "tag" "-c" (if branchp "-b") name) | 674 | (vc-cvs-command nil 0 dir "tag" "-c" (if branchp "-b") name) |
| 666 | (when branchp (vc-cvs-command nil 0 dir "update" "-r" name))) | 675 | (when branchp (vc-cvs-command nil 0 dir "update" "-r" name))) |
| 667 | 676 | ||
| 677 | ;; Follows vc-cvs-command, which uses vc-do-command from vc-dispatcher. | ||
| 678 | (declare-function vc-resynch-buffer "vc-dispatcher" | ||
| 679 | (file &optional keep noquery reset-vc-info)) | ||
| 680 | |||
| 668 | (defun vc-cvs-retrieve-tag (dir name update) | 681 | (defun vc-cvs-retrieve-tag (dir name update) |
| 669 | "Retrieve a tag at and below DIR. | 682 | "Retrieve a tag at and below DIR. |
| 670 | NAME is the name of the tag; if it is empty, do a `cvs update'. | 683 | NAME is the name of the tag; if it is empty, do a `cvs update'. |
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index caece2ec277..af5be361047 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -443,6 +443,12 @@ or an empty string if none." | |||
| 443 | (when next-stage | 443 | (when next-stage |
| 444 | (vc-git-dir-status-goto-stage next-stage files update-function)))) | 444 | (vc-git-dir-status-goto-stage next-stage files update-function)))) |
| 445 | 445 | ||
| 446 | ;; Follows vc-git-command (or vc-do-async-command), which uses vc-do-command | ||
| 447 | ;; from vc-dispatcher. | ||
| 448 | (declare-function vc-exec-after "vc-dispatcher" (code)) | ||
| 449 | ;; Follows vc-exec-after. | ||
| 450 | (declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) | ||
| 451 | |||
| 446 | (defun vc-git-dir-status-goto-stage (stage files update-function) | 452 | (defun vc-git-dir-status-goto-stage (stage files update-function) |
| 447 | (erase-buffer) | 453 | (erase-buffer) |
| 448 | (pcase stage | 454 | (pcase stage |
| @@ -731,6 +737,8 @@ This prompts for a branch to merge from." | |||
| 731 | 737 | ||
| 732 | ;;; HISTORY FUNCTIONS | 738 | ;;; HISTORY FUNCTIONS |
| 733 | 739 | ||
| 740 | (autoload 'vc-setup-buffer "vc-dispatcher") | ||
| 741 | |||
| 734 | (defun vc-git-print-log (files buffer &optional shortlog start-revision limit) | 742 | (defun vc-git-print-log (files buffer &optional shortlog start-revision limit) |
| 735 | "Print commit log associated with FILES into specified BUFFER. | 743 | "Print commit log associated with FILES into specified BUFFER. |
| 736 | If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'. | 744 | If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'. |
| @@ -857,6 +865,8 @@ or BRANCH^ (where \"^\" can be repeated)." | |||
| 857 | (indent-region (point-min) (point-max) 2) | 865 | (indent-region (point-min) (point-max) 2) |
| 858 | (buffer-string)))) | 866 | (buffer-string)))) |
| 859 | 867 | ||
| 868 | (autoload 'vc-switches "vc") | ||
| 869 | |||
| 860 | (defun vc-git-diff (files &optional rev1 rev2 buffer) | 870 | (defun vc-git-diff (files &optional rev1 rev2 buffer) |
| 861 | "Get a difference report using Git between two revisions of FILES." | 871 | "Get a difference report using Git between two revisions of FILES." |
| 862 | (let (process-file-side-effects) | 872 | (let (process-file-side-effects) |
| @@ -1010,6 +1020,12 @@ or BRANCH^ (where \"^\" can be repeated)." | |||
| 1010 | (or (vc-file-getprop file 'git-root) | 1020 | (or (vc-file-getprop file 'git-root) |
| 1011 | (vc-file-setprop file 'git-root (vc-find-root file ".git")))) | 1021 | (vc-file-setprop file 'git-root (vc-find-root file ".git")))) |
| 1012 | 1022 | ||
| 1023 | ;; grep-compute-defaults autoloads grep. | ||
| 1024 | (declare-function grep-read-regexp "grep" ()) | ||
| 1025 | (declare-function grep-read-files "grep" (regexp)) | ||
| 1026 | (declare-function grep-expand-template "grep" | ||
| 1027 | (template &optional regexp files dir excl)) | ||
| 1028 | |||
| 1013 | ;; Derived from `lgrep'. | 1029 | ;; Derived from `lgrep'. |
| 1014 | (defun vc-git-grep (regexp &optional files dir) | 1030 | (defun vc-git-grep (regexp &optional files dir) |
| 1015 | "Run git grep, searching for REGEXP in FILES in directory DIR. | 1031 | "Run git grep, searching for REGEXP in FILES in directory DIR. |
| @@ -1065,6 +1081,10 @@ This command shares argument histories with \\[rgrep] and \\[grep]." | |||
| 1065 | (if (eq next-error-last-buffer (current-buffer)) | 1081 | (if (eq next-error-last-buffer (current-buffer)) |
| 1066 | (setq default-directory dir)))))) | 1082 | (setq default-directory dir)))))) |
| 1067 | 1083 | ||
| 1084 | ;; Everywhere but here, follows vc-git-command, which uses vc-do-command | ||
| 1085 | ;; from vc-dispatcher. | ||
| 1086 | (autoload 'vc-resynch-buffer "vc-dispatcher") | ||
| 1087 | |||
| 1068 | (defun vc-git-stash (name) | 1088 | (defun vc-git-stash (name) |
| 1069 | "Create a stash." | 1089 | "Create a stash." |
| 1070 | (interactive "sStash name: ") | 1090 | (interactive "sStash name: ") |
| @@ -1122,6 +1142,9 @@ This command shares argument histories with \\[rgrep] and \\[grep]." | |||
| 1122 | (match-string 1) | 1142 | (match-string 1) |
| 1123 | (error "Cannot find stash at point")))) | 1143 | (error "Cannot find stash at point")))) |
| 1124 | 1144 | ||
| 1145 | ;; vc-git-stash-delete-at-point must be called from a vc-dir buffer. | ||
| 1146 | (declare-function vc-dir-refresh "vc-dir" ()) | ||
| 1147 | |||
| 1125 | (defun vc-git-stash-delete-at-point () | 1148 | (defun vc-git-stash-delete-at-point () |
| 1126 | (interactive) | 1149 | (interactive) |
| 1127 | (let ((stash (vc-git-stash-get-at-point (point)))) | 1150 | (let ((stash (vc-git-stash-get-at-point (point)))) |
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index feec015e52a..a80a103c675 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -245,6 +245,8 @@ highlighting the Log View buffer." | |||
| 245 | (repeat :tag "Argument List" :value ("") string)) | 245 | (repeat :tag "Argument List" :value ("") string)) |
| 246 | :group 'vc-hg) | 246 | :group 'vc-hg) |
| 247 | 247 | ||
| 248 | (autoload 'vc-setup-buffer "vc-dispatcher") | ||
| 249 | |||
| 248 | (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit) | 250 | (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit) |
| 249 | "Print commit log associated with FILES into specified BUFFER. | 251 | "Print commit log associated with FILES into specified BUFFER. |
| 250 | If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'. | 252 | If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'. |
| @@ -306,6 +308,8 @@ If LIMIT is non-nil, show no more than this many entries." | |||
| 306 | ("^tag: +\\([^ ]+\\)$" (1 'highlight)) | 308 | ("^tag: +\\([^ ]+\\)$" (1 'highlight)) |
| 307 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) | 309 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) |
| 308 | 310 | ||
| 311 | (autoload 'vc-switches "vc") | ||
| 312 | |||
| 309 | (defun vc-hg-diff (files &optional oldvers newvers buffer) | 313 | (defun vc-hg-diff (files &optional oldvers newvers buffer) |
| 310 | "Get a difference report using hg between two revisions of FILES." | 314 | "Get a difference report using hg between two revisions of FILES." |
| 311 | (let* ((firstfile (car files)) | 315 | (let* ((firstfile (car files)) |
| @@ -591,6 +595,12 @@ REV is the revision to check out into WORKFILE." | |||
| 591 | (forward-line)) | 595 | (forward-line)) |
| 592 | (funcall update-function result))) | 596 | (funcall update-function result))) |
| 593 | 597 | ||
| 598 | ;; Follows vc-hg-command (or vc-do-async-command), which uses vc-do-command | ||
| 599 | ;; from vc-dispatcher. | ||
| 600 | (declare-function vc-exec-after "vc-dispatcher" (code)) | ||
| 601 | ;; Follows vc-exec-after. | ||
| 602 | (declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) | ||
| 603 | |||
| 594 | (defun vc-hg-dir-status (dir update-function) | 604 | (defun vc-hg-dir-status (dir update-function) |
| 595 | (vc-hg-command (current-buffer) 'async dir "status" "-C") | 605 | (vc-hg-command (current-buffer) 'async dir "status" "-C") |
| 596 | (vc-exec-after | 606 | (vc-exec-after |
| @@ -651,6 +661,8 @@ REV is the revision to check out into WORKFILE." | |||
| 651 | ;; modified files | 661 | ;; modified files |
| 652 | "Value of `compilation-error-regexp-alist' in *vc-hg* buffers.") | 662 | "Value of `compilation-error-regexp-alist' in *vc-hg* buffers.") |
| 653 | 663 | ||
| 664 | (autoload 'vc-do-async-command "vc-dispatcher") | ||
| 665 | |||
| 654 | (defun vc-hg-pull (prompt) | 666 | (defun vc-hg-pull (prompt) |
| 655 | "Issue a Mercurial pull command. | 667 | "Issue a Mercurial pull command. |
| 656 | If called interactively with a set of marked Log View buffers, | 668 | If called interactively with a set of marked Log View buffers, |
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index d3cf650ddf9..7bce1ea3ba6 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el | |||
| @@ -155,6 +155,8 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 155 | (vc-sccs-state file)))) | 155 | (vc-sccs-state file)))) |
| 156 | (vc-sccs-state file))) | 156 | (vc-sccs-state file))) |
| 157 | 157 | ||
| 158 | (autoload 'vc-expand-dirs "vc") | ||
| 159 | |||
| 158 | (defun vc-sccs-dir-status (dir update-function) | 160 | (defun vc-sccs-dir-status (dir update-function) |
| 159 | ;; FIXME: this function should be rewritten, using `vc-expand-dirs' | 161 | ;; FIXME: this function should be rewritten, using `vc-expand-dirs' |
| 160 | ;; is not TRTD because it returns files from multiple backends. | 162 | ;; is not TRTD because it returns files from multiple backends. |
| @@ -216,6 +218,8 @@ Optional string REV is a revision." | |||
| 216 | ;; SCCS is totally file-oriented, so all we have to do is make the directory | 218 | ;; SCCS is totally file-oriented, so all we have to do is make the directory |
| 217 | (make-directory "SCCS")) | 219 | (make-directory "SCCS")) |
| 218 | 220 | ||
| 221 | (autoload 'vc-switches "vc") | ||
| 222 | |||
| 219 | (defun vc-sccs-register (files &optional rev comment) | 223 | (defun vc-sccs-register (files &optional rev comment) |
| 220 | "Register FILES into the SCCS version-control system. | 224 | "Register FILES into the SCCS version-control system. |
| 221 | REV is the optional revision number for the file. COMMENT can be used | 225 | REV is the optional revision number for the file. COMMENT can be used |
| @@ -356,6 +360,9 @@ Remaining arguments are ignored." | |||
| 356 | (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files)) | 360 | (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-name files)) |
| 357 | (when limit 'limit-unsupported)) | 361 | (when limit 'limit-unsupported)) |
| 358 | 362 | ||
| 363 | (autoload 'vc-setup-buffer "vc-dispatcher") | ||
| 364 | (autoload 'vc-delistify "vc-dispatcher") | ||
| 365 | |||
| 359 | ;; FIXME use sccsdiff if present? | 366 | ;; FIXME use sccsdiff if present? |
| 360 | (defun vc-sccs-diff (files &optional oldvers newvers buffer) | 367 | (defun vc-sccs-diff (files &optional oldvers newvers buffer) |
| 361 | "Get a difference report using SCCS between two filesets." | 368 | "Get a difference report using SCCS between two filesets." |
| @@ -432,6 +439,9 @@ Remaining arguments are ignored." | |||
| 432 | ;;; our own set of name-to-revision mappings. | 439 | ;;; our own set of name-to-revision mappings. |
| 433 | ;;; | 440 | ;;; |
| 434 | 441 | ||
| 442 | (autoload 'vc-tag-precondition "vc") | ||
| 443 | (declare-function vc-file-tree-walk "vc" (dirname func &rest args)) | ||
| 444 | |||
| 435 | (defun vc-sccs-create-tag (dir name branchp) | 445 | (defun vc-sccs-create-tag (dir name branchp) |
| 436 | (when branchp | 446 | (when branchp |
| 437 | (error "SCCS backend does not support module branches")) | 447 | (error "SCCS backend does not support module branches")) |
| @@ -460,6 +470,8 @@ Remaining arguments are ignored." | |||
| 460 | (goto-char (point-min)) | 470 | (goto-char (point-min)) |
| 461 | (re-search-forward "%[A-Z]%" nil t))) | 471 | (re-search-forward "%[A-Z]%" nil t))) |
| 462 | 472 | ||
| 473 | (autoload 'vc-rename-master "vc") | ||
| 474 | |||
| 463 | (defun vc-sccs-rename-file (old new) | 475 | (defun vc-sccs-rename-file (old new) |
| 464 | ;; Move the master file (using vc-rcs-master-templates). | 476 | ;; Move the master file (using vc-rcs-master-templates). |
| 465 | (vc-rename-master (vc-name old) new vc-sccs-master-templates) | 477 | (vc-rename-master (vc-name old) new vc-sccs-master-templates) |