[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: diff-switches defined in two places
From: |
Gerd Moellmann |
Subject: |
Re: diff-switches defined in two places |
Date: |
22 Oct 2001 01:09:05 +0200 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.1.50 |
Simon Josefsson <jas@extundo.com> writes:
> `diff-switches' is defined in diff.el (with defcustom) and vc.el (with
> defun), and the latter definition seem to take over which makes it is
> impossible to customize `diff-switches'.
>
> I don't understand why `diff-switches' is defined in vc.el, the
> variable is autoloaded from diff.el anyway. The patch below removes
> the definition and changes the default value of vc-diff-switches as
> well. It seems it didn't have a :version tag though..
>
> --- vc.el- Sun Oct 21 21:38:21 2001
> +++ vc.el Sun Oct 21 21:39:44 2001
> @@ -466,11 +466,7 @@
> (defconst vc-maximum-comment-ring-size 32
> "Maximum number of saved comments in the comment ring.")
>
> -;; This is duplicated in diff.el.
> -(defvar diff-switches "-c"
> - "*A string or list of strings specifying switches to be passed to diff.")
> -
> -(defcustom vc-diff-switches nil
> +(defcustom vc-diff-switches diff-switches
> "*A string or list of strings specifying switches for diff under VC.
> There is also an option vc-BACKEND-diff-switches for each BACKEND that
> VC can handle."
That's something for Andre (CC'd) or Stefan, I think.