aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel1998-12-02 13:34:59 +0000
committerAndré Spiegel1998-12-02 13:34:59 +0000
commitbeba4bd9f6b3cf5c610827b3aaea205ca934445f (patch)
tree3f23f00bf09a286098bdc25e7437e9bc1e634a39
parentb9431ae03745a92b456b0eef9651ff810dd3b3ce (diff)
downloademacs-beba4bd9f6b3cf5c610827b3aaea205ca934445f.tar.gz
emacs-beba4bd9f6b3cf5c610827b3aaea205ca934445f.zip
(vc-dired-window-configuration, vc-ediff-windows,
vc-ediff-result, vc-dired-switches, vc-dired-terse-mode): Added defvars to suppress compilation warnings.
-rw-r--r--lisp/vc.el10
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 @@
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> 6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
7 7
8;; $Id: vc.el,v 1.238 1998/10/30 19:11:08 fx Exp spiegel $ 8;; $Id: vc.el,v 1.239 1998/11/04 15:09:38 spiegel Exp spiegel $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -928,6 +928,8 @@ before the filename."
928 (vc-checkin file version comment) 928 (vc-checkin file version comment)
929 ))))) 929 )))))
930 930
931(defvar vc-dired-window-configuration)
932
931(defun vc-next-action-dired (file rev comment) 933(defun vc-next-action-dired (file rev comment)
932 ;; Do a vc-next-action-on-file on all the marked files, possibly 934 ;; Do a vc-next-action-on-file on all the marked files, possibly
933 ;; passing on the log comment we've just entered. 935 ;; passing on the log comment we've just entered.
@@ -1559,6 +1561,9 @@ the variable `vc-header-alist'."
1559 (message "File contains conflict markers")) 1561 (message "File contains conflict markers"))
1560 (message "Merge successful")))))) 1562 (message "Merge successful"))))))
1561 1563
1564(defvar vc-ediff-windows)
1565(defvar vc-ediff-result)
1566
1562;;;###autoload 1567;;;###autoload
1563(defun vc-resolve-conflicts (&optional name-A name-B) 1568(defun vc-resolve-conflicts (&optional name-A name-B)
1564 "Invoke ediff to resolve conflicts in the current buffer. 1569 "Invoke ediff to resolve conflicts in the current buffer.
@@ -1646,6 +1651,9 @@ The conflicts must be marked with rcsmerge conflict markers."
1646;; The VC directory major mode. Coopt Dired for this. 1651;; The VC directory major mode. Coopt Dired for this.
1647;; All VC commands get mapped into logical equivalents. 1652;; All VC commands get mapped into logical equivalents.
1648 1653
1654(defvar vc-dired-switches)
1655(defvar vc-dired-terse-mode)
1656
1649(define-derived-mode vc-dired-mode dired-mode "Dired under VC" 1657(define-derived-mode vc-dired-mode dired-mode "Dired under VC"
1650 "The major mode used in VC directory buffers. It works like Dired, 1658 "The major mode used in VC directory buffers. It works like Dired,
1651but lists only files under version control, with the current VC state of 1659but lists only files under version control, with the current VC state of