diff options
| author | André Spiegel <spiegel@gnu.org> | 1998-12-02 13:34:59 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 1998-12-02 13:34:59 +0000 |
| commit | beba4bd9f6b3cf5c610827b3aaea205ca934445f (patch) | |
| tree | 3f23f00bf09a286098bdc25e7437e9bc1e634a39 /lisp/vc.el | |
| parent | b9431ae03745a92b456b0eef9651ff810dd3b3ce (diff) | |
| download | emacs-beba4bd9f6b3cf5c610827b3aaea205ca934445f.tar.gz | |
(vc-dired-window-configuration, vc-ediff-windows,
vc-ediff-result, vc-dired-switches, vc-dired-terse-mode):
Added defvars to suppress compilation warnings.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 4600defef4b..2d4519ff31f 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -5,7 +5,7 @@ ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> -;; $Id: vc.el,v 1.238 1998/10/30 19:11:08 fx Exp spiegel $ +;; $Id: vc.el,v 1.239 1998/11/04 15:09:38 spiegel Exp spiegel $ ;; This file is part of GNU Emacs. @@ -928,6 +928,8 @@ before the filename." (vc-checkin file version comment) ))))) +(defvar vc-dired-window-configuration) + (defun vc-next-action-dired (file rev comment) ;; Do a vc-next-action-on-file on all the marked files, possibly ;; passing on the log comment we've just entered. @@ -1559,6 +1561,9 @@ the variable `vc-header-alist'." (message "File contains conflict markers")) (message "Merge successful")))))) +(defvar vc-ediff-windows) +(defvar vc-ediff-result) + ;;;###autoload (defun vc-resolve-conflicts (&optional name-A name-B) "Invoke ediff to resolve conflicts in the current buffer. @@ -1646,6 +1651,9 @@ The conflicts must be marked with rcsmerge conflict markers." ;; The VC directory major mode. Coopt Dired for this. ;; All VC commands get mapped into logical equivalents. +(defvar vc-dired-switches) +(defvar vc-dired-terse-mode) + (define-derived-mode vc-dired-mode dired-mode "Dired under VC" "The major mode used in VC directory buffers. It works like Dired, but lists only files under version control, with the current VC state of |