From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 10 Mar 2000 22:23:26 +0000 (+0000)
Subject: Change VC-DIFF to compare the revisions using no switches (i.e.
X-Git-Tag: 20090517-FFI~4205
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=93271b4df0c614394958b8399f97e36f28822347;p=mit-scheme.git

Change VC-DIFF to compare the revisions using no switches (i.e.
ignoring nothing), and to display the differences using the switches
of the user's choice.
---

diff --git a/v7/src/edwin/vc.scm b/v7/src/edwin/vc.scm
index c158982c7..4b2025ce9 100644
--- a/v7/src/edwin/vc.scm
+++ b/v7/src/edwin/vc.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: vc.scm,v 1.32 2000/03/10 20:52:25 cph Exp $
+;;; $Id: vc.scm,v 1.33 2000/03/10 22:23:26 cph Exp $
 ;;;
 ;;; Copyright (c) 1994-2000 Massachusetts Institute of Technology
 ;;;
@@ -299,6 +299,7 @@ lock steals will raise an error.
 	     (do-it))
 	    ((cleanup-pop-up-buffers
 	      (lambda ()
+		(vc-backend-diff master #f #f #f)
 		(let ((diff-buffer (get-vc-command-buffer)))
 		  (insert-string
 		   (string-append "Changes to "
@@ -422,7 +423,7 @@ files in or below it."
 	(rev2 (vc-normalize-version rev2)))
     (let ((rev1 (if (or rev1 rev2) rev1 (vc-workfile-version master))))
       (if (and (or rev1 rev2 (not (vc-workfile-modified? master)))
-	       (= 0 (vc-backend-diff master rev1 rev2 #f)))
+	       (= 0 (vc-backend-diff master rev1 rev2 #t)))
 	  (begin
 	    (message "No changes to "
 		     (vc-workfile-string master)
@@ -433,6 +434,7 @@ files in or below it."
 		     ".")
 	    #t)
 	  (begin
+	    (vc-backend-diff master rev1 rev2 #f)
 	    (pop-up-vc-command-buffer #t)
 	    #f)))))