From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Michael Ernst Newsgroups: gmane.emacs.bugs Subject: vc.el and diff-switches containing "-r" Date: Mon, 25 Mar 2002 17:42:53 -0500 Sender: bug-gnu-emacs-admin@gnu.org Message-ID: <200203252242.RAA17002@meoptiplex.lcs.mit.edu> NNTP-Posting-Host: localhost.gmane.org X-Trace: main.gmane.org 1017096344 21010 127.0.0.1 (25 Mar 2002 22:45:44 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 25 Mar 2002 22:45:44 +0000 (UTC) Original-Received: from fencepost.gnu.org ([199.232.76.164]) by main.gmane.org with esmtp (Exim 3.33 #1 (Debian)) id 16pdDj-0005Sl-00 for ; Mon, 25 Mar 2002 23:45:43 +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 16pdDh-0001B5-00; Mon, 25 Mar 2002 17:45:41 -0500 Original-Received: from geyer.lcs.mit.edu ([18.26.3.21]) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 16pdB0-00013q-00; Mon, 25 Mar 2002 17:42:54 -0500 Original-Received: from meoptiplex.lcs.mit.edu (meoptiplex.lcs.mit.edu [18.26.3.32]) by geyer.lcs.mit.edu (8.9.3/8.9.3) with ESMTP id RAA14900; Mon, 25 Mar 2002 17:42:53 -0500 Original-Received: (from mernst@localhost) by meoptiplex.lcs.mit.edu (8.9.3/8.9.1) id RAA17002; Mon, 25 Mar 2002 17:42:53 -0500 Original-To: Andre Spiegel , bug-gnu-emacs@gnu.org 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:175 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:175 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.) 2002-03-25 Michael Ernst * vc.el (vc-diff-internal, vc-diff-switches-list): Remove "-r" from `diff-switches'. *** /usr/local/share/emacs/21.2/lisp/vc.el Wed Mar 13 14:51:46 2002 --- - Mon Mar 25 16:06:25 2002 *************** *** 1815,1821 **** (if (and file-rel1 file-rel2) (apply 'vc-do-command "*vc-diff*" 1 "diff" nil ! (append (if (listp diff-switches) ! diff-switches ! (list diff-switches)) (if (listp vc-diff-switches) vc-diff-switches --- 1815,1822 ---- (if (and file-rel1 file-rel2) (apply 'vc-do-command "*vc-diff*" 1 "diff" nil ! (append (remove "-r" ! (if (listp diff-switches) ! diff-switches ! (list diff-switches))) (if (listp vc-diff-switches) vc-diff-switches *************** *** 1828,1832 **** "Return the list of switches to use for executing diff under BACKEND." `(append ! (if (listp diff-switches) diff-switches (list diff-switches)) (if (listp vc-diff-switches) vc-diff-switches (list vc-diff-switches)) (let ((backend-switches --- 1829,1834 ---- "Return the list of switches to use for executing diff under BACKEND." `(append ! (remove "-r" ! (if (listp diff-switches) diff-switches (list diff-switches))) (if (listp vc-diff-switches) vc-diff-switches (list vc-diff-switches)) (let ((backend-switches