Mercurial > emacs

changeset 32310:bb71607dc3db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-version-diff): diff-switches can be a list.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 08 Oct 2000 19:12:52 +0000
parents bb96b2ece52b
children 035ce2227d76
files lisp/vc.el
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Sun Oct 08 19:11:34 2000 +0000
+++ b/lisp/vc.el	Sun Oct 08 19:12:52 2000 +0000
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc.el,v 1.277 2000/10/04 09:48:37 spiegel Exp $
+;; $Id: vc.el,v 1.278 2000/10/05 22:55:17 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -1531,11 +1531,16 @@
     (if (string-equal rel2 "")
 	(setq rel2 nil))
     (let ((file-rel1 (vc-version-backup-file file rel1))
-	  (file-rel2 (if (not rel2) 
-			 file 
+	  (file-rel2 (if (not rel2)
+			 file
 		       (vc-version-backup-file file rel2))))
       (if (and file-rel1 file-rel2)
-	  (vc-do-command t 1 "diff" nil diff-switches file-rel1 file-rel2)
+	  (apply 'vc-do-command t 1 "diff" nil
+		 (append (if (listp diff-switches)
+			     diff-switches
+			   (list diff-switches))
+			 (list (file-relative-name file-rel1)
+			       (file-relative-name file-rel2))))
 	(cd (file-name-directory file))
 	(vc-call diff file rel1 rel2))))
   (if (and (zerop (buffer-size))