From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 23 Aug 2004 18:23:52 +0000 (+0000)
Subject: (vc-svn-diff): Treat options from vc-svn-diff-switches and
X-Git-Tag: ttn-vms-21-2-B4~5192
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9d1f3be2fa27740b99e2237e2bec8860210e7c5;p=emacs.git

(vc-svn-diff): Treat options from vc-svn-diff-switches and
vc-diff-switches differently.
---

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 82c09cbd435..fafb5eff7cd 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -1,6 +1,7 @@
 ;;; vc-svn.el --- non-resident support for Subversion version-control
 
-;; Copyright (C) 1995,98,99,2000,2001,02,2003  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;;           Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
@@ -363,7 +364,10 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
 	       (append (vc-switches nil 'diff) '("/dev/null")))
 	;; Even if it's empty, it's locally modified.
 	1)
-    (let* ((switches (vc-switches 'SVN 'diff))
+    (let* ((switches
+	    (if vc-svn-diff-switches
+		(vc-switches 'SVN 'diff)
+	      (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
 	   (async (and (vc-stay-local-p file)
 		       (or oldvers newvers) ; Svn diffs those locally.
 		       (fboundp 'start-process))))
@@ -371,8 +375,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
 	     (if async 'async 0)
 	     file "diff"
 	     (append
-	      (when switches
-		(list "-x" (mapconcat 'identity switches " ")))
+	      switches
 	      (when oldvers
 		(list "-r" (if newvers (concat oldvers ":" newvers)
 			     oldvers)))))
@@ -504,5 +507,5 @@ essential information."
 
 (provide 'vc-svn)
 
-;;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
+;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
 ;;; vc-svn.el ends here