aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel2001-10-21 23:31:45 +0000
committerAndré Spiegel2001-10-21 23:31:45 +0000
commite98b08246cf5ea44a5168e0eed2169f1eb571cbd (patch)
treeab842227983eb9a89fc27cafbdd6b54c94247825
parent26fe1f9257093ec5aeb13565805618d138d5a9ef (diff)
downloademacs-e98b08246cf5ea44a5168e0eed2169f1eb571cbd.tar.gz
emacs-e98b08246cf5ea44a5168e0eed2169f1eb571cbd.zip
(diff-switches): Remove duplicate definition.
-rw-r--r--lisp/vc.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index b13c987df15..11193f131fd 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -6,7 +6,7 @@
6;; Maintainer: Andre Spiegel <spiegel@gnu.org> 6;; Maintainer: Andre Spiegel <spiegel@gnu.org>
7;; Keywords: tools 7;; Keywords: tools
8 8
9;; $Id: vc.el,v 1.311 2001/09/24 22:29:15 monnier Exp $ 9;; $Id: vc.el,v 1.312 2001/10/21 12:15:22 spiegel Exp $
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
12 12
@@ -473,10 +473,6 @@ These are passed to the checkin program by \\[vc-register]."
473(defconst vc-maximum-comment-ring-size 32 473(defconst vc-maximum-comment-ring-size 32
474 "Maximum number of saved comments in the comment ring.") 474 "Maximum number of saved comments in the comment ring.")
475 475
476;; This is duplicated in diff.el.
477(defvar diff-switches "-c"
478 "*A string or list of strings specifying switches to be passed to diff.")
479
480(defcustom vc-diff-switches nil 476(defcustom vc-diff-switches nil
481 "*A string or list of strings specifying switches for diff under VC. 477 "*A string or list of strings specifying switches for diff under VC.
482There is also an option vc-BACKEND-diff-switches for each BACKEND that 478There is also an option vc-BACKEND-diff-switches for each BACKEND that