From ad8c666b93f352c755bbb936406e53ceaeae295d Mon Sep 17 00:00:00 2001 From: "Taylor R. Campbell" Date: Thu, 28 Aug 2008 19:39:19 +0000 Subject: [PATCH] In `vc-version-diff', ask to save the file only if we are diffing against the current revision. If we are diffing two specified revisions, there is no need to save changes in the buffer. Fix the CVS method for LOCKING-USER in the case when FILE-ATTRIBUTES returns #F. --- v7/src/edwin/vc.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/v7/src/edwin/vc.scm b/v7/src/edwin/vc.scm index 77cf4e9da..4dd483233 100644 --- a/v7/src/edwin/vc.scm +++ b/v7/src/edwin/vc.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: vc.scm,v 1.112 2008/01/30 20:02:07 cph Exp $ +$Id: vc.scm,v 1.113 2008/08/28 19:39:19 riastradh Exp $ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -790,7 +790,8 @@ and two version designators specifying which versions to compare." (vc-diff (file-vc-master workfile #t) rev1 rev2)))) (define (vc-diff master rev1 rev2) - (vc-save-workfile-buffer (vc-master-workfile master)) + (if (not (and rev1 rev2)) + (vc-save-workfile-buffer (vc-master-workfile master))) (let ((rev1 (vc-normalize-revision rev1)) (rev2 (vc-normalize-revision rev2))) (if (and (or rev1 rev2 (vc-backend-workfile-modified? master)) @@ -1825,9 +1826,9 @@ the value of vc-log-mode-hook." (and t1 t2 (string=? (file-time->global-ctime-string t1) t2)))) (cvs-file-edited? master)) - (unix/uid->string - (file-attributes/uid - (file-attributes (vc-master-workfile master))))))) + (let ((attributes (file-attributes (vc-master-workfile master)))) + (and attributes + (unix/uid->string (file-attributes/uid attributes))))))) (define-vc-type-operation 'WORKFILE-MODIFIED? vc-type:cvs (lambda (master) -- 2.25.1