From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 7 Jun 2001 17:48:19 +0000 (+0000)
Subject: VC's state is wiped out when the workfile's buffer has it's mode
X-Git-Tag: 20090517-FFI~2718
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c155c4f812d73d06feca4348daf3c4f6a0149b8e;p=mit-scheme.git

VC's state is wiped out when the workfile's buffer has it's mode
changed.  Use new event EVENT:SET-BUFFER-MAJOR-MODE to reset it at
that time.
---

diff --git a/v7/src/edwin/vc.scm b/v7/src/edwin/vc.scm
index 4170227ad..09f9efcfa 100644
--- a/v7/src/edwin/vc.scm
+++ b/v7/src/edwin/vc.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: vc.scm,v 1.78 2001/06/07 17:44:21 cph Exp $
+;;; $Id: vc.scm,v 1.79 2001/06/07 17:48:19 cph Exp $
 ;;;
 ;;; Copyright (c) 1994-2001 Massachusetts Institute of Technology
 ;;;
@@ -373,7 +373,9 @@ Otherwise, the mod time of the file is the checkout time."
 	  (begin
 	    (buffer-remove! buffer 'VC-MASTER)
 	    (if (vc-dired-buffer? buffer)
-		(file-vc-master (dired-this-file buffer error?) error?)
+		(let ((workfile (dired-this-file buffer error?)))
+		  (and workfile
+		       (file-vc-master workfile error?)))
 		(let ((workfile (buffer-pathname buffer)))
 		  (if workfile
 		      (let ((master (%file-vc-master workfile error?)))