You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Karl Fogel <kf...@newton.ch.collab.net> on 2003/04/10 18:24:57 UTC
Re: svn diff; vc-svn-diff in vc-svn.el
Karl Chen <qu...@hkn.eecs.berkeley.edu> writes:
> Also a typo in vc-svn.el prevents the vc-svn-diff function from being
> used at all even though the diff switches are ignored by the function
> and then possibly svn itself.
>
> --- vc-svn.el (revision 5495)
> +++ vc-svn.el (working copy)
> @@ -280,11 +280,11 @@
> workfile contents as the newer version.
> This function returns a status of either 0 (no differences found), or
> 1 (either non-empty diff or the diff is run asynchronously)."
> - (let* ((diff-switches-list (vc-diff-switches-list svn))
> + (let* ((diff-switches-list (vc-diff-switches-list 'svn))
> (status (vc-svn-run-status file))
> (local (elt status 1))
The code works for me without this patch; `vc-diff-switches-list' is a
macro not a function.
What was the error you were getting?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn diff; vc-svn-diff in vc-svn.el
Posted by Karl Chen <qu...@hkn.eecs.berkeley.edu>.
It turns out Emacs 21.4 (in development) changed (from 21.2) the
vc-diff-switches-list list function so that you would pass 'svn
instead of svn. So it's not an issue yet but when Emacs 21.4 is
released you'll need to add a wrapper that checks the Emacs version
(ugly). Or you could (defvar svn 'svn) as a kludge.
Karl
>>>>> "kfogel" == Karl Fogel <kf...@newton.ch.collab.net> writes:
kfogel> Karl Chen <qu...@hkn.eecs.berkeley.edu> writes:
>> Also a typo in vc-svn.el prevents the vc-svn-diff function from
>> being used at all even though the diff switches are ignored by
>> the function and then possibly svn itself.
>>
>> --- vc-svn.el (revision 5495)
>> +++ vc-svn.el (working copy)
>> @@ -280,11 +280,11 @@
>> workfile contents as the newer version.
>> This function returns a status of either 0 (no differences found), or
>> 1 (either non-empty diff or the diff is run asynchronously)."
>> - (let* ((diff-switches-list (vc-diff-switches-list svn))
>> + (let* ((diff-switches-list (vc-diff-switches-list 'svn))
>> (status (vc-svn-run-status file))
>> (local (elt status 1))
kfogel> The code works for me without this patch;
kfogel> `vc-diff-switches-list' is a macro not a function.
kfogel> What was the error you were getting?
--
Karl Chen / quarl@quarl.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org