From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Andre Spiegel Newsgroups: gmane.emacs.bugs Subject: Re: vc.el and diff-switches containing "-r" Date: 26 Mar 2002 20:18:08 +0100 Sender: bug-gnu-emacs-admin@gnu.org Message-ID: <87g02n3zpr.fsf@eagle.inf.fu-berlin.de> References: <200203252242.RAA17002@meoptiplex.lcs.mit.edu> NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1017170296 23881 127.0.0.1 (26 Mar 2002 19:18:16 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Tue, 26 Mar 2002 19:18:16 +0000 (UTC) Cc: bug-gnu-emacs@gnu.org Original-Received: from fencepost.gnu.org ([199.232.76.164]) by main.gmane.org with esmtp (Exim 3.33 #1 (Debian)) id 16pwSW-0006D4-00 for ; Tue, 26 Mar 2002 20:18:16 +0100 Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 16pwSU-0005ym-00; Tue, 26 Mar 2002 14:18:14 -0500 Original-Received: from stu1ir100-135-199.ras.tesion.net ([213.182.135.199] helo=eagle.inf.fu-berlin.de) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 16pwRs-0005xw-00 for ; Tue, 26 Mar 2002 14:17:36 -0500 Original-Received: from spiegel by eagle.inf.fu-berlin.de with local (Exim 3.34 #1 (Debian)) id 16pwSO-0000R9-00; Tue, 26 Mar 2002 20:18:08 +0100 Original-To: Michael Ernst In-Reply-To: <200203252242.RAA17002@meoptiplex.lcs.mit.edu> Original-Lines: 22 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2.50 Errors-To: bug-gnu-emacs-admin@gnu.org X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.0.5 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Bug reports for GNU Emacs, the Swiss army knife of text editors List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.bugs:205 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:205 Michael Ernst writes: > vc.el unconditionally uses `diff-switches' (though it also concatenates > `vc-diff-switches'). However, some switches that are sensible in > `diff-switches' are not sensible as arguments to (say) "cvs diff". This > patch corrects the problem. (Another solution would be for > `vc-diff-switches' to override `diff-switches', if set, rather than for > both to be used.) Thanks for the report. I do favour the latter approach, where vc-diff-switches overrides diff-switches if set. Likewise, I think vc-cvs-diff-switches should override the other two if set, rather than be concatenated. I don't like the idea of treating "-r" specially as in your patch -- the same problem would be bound to come up with other options and other backends as well. I will change the behaviour as outlined above as soon as I find time to rework the backend-specific variable handling, as I am planning anyway. It will be before the next Emacs release. Until then, I hope you can do with your local modification.