From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 3 May 2001 00:36:07 +0000 (+0000)
Subject: (vc-next-action-on-file): Only force buffer+file to writable
X-Git-Tag: emacs-pretest-21.0.103~60
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd8092f01beda5bc1f24a801aec8ffcd152b126e;p=emacs.git

(vc-next-action-on-file): Only force buffer+file to writable
if both the buffer and the file are read-only.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index 8fbd2bc27e9..2d879b32884 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc.el,v 1.297 2001/02/26 13:45:06 spiegel Exp $
+;; $Id: vc.el,v 1.298 2001/03/10 10:44:35 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -1096,7 +1096,8 @@ If VERBOSE is non-nil, query the user rather than using default parameters."
 	  (message "%s is up-to-date" file))))
 
        ;; Abnormal: edited but read-only
-       ((and visited (eq state 'edited) buffer-read-only)
+       ((and visited (eq state 'edited)
+	     buffer-read-only (not (file-writable-p file)))
 	;; Make the file+buffer read-write.  If the user really wanted to
 	;; commit, he'll get a chance to do that next time around, anyway.
 	(message "File is edited but read-only; making it writable")
@@ -2356,10 +2357,9 @@ allowed and simply skipped)."
         (setq update (and (eq result 'visited) update))
         (vc-file-tree-walk
          dir
-         (lambda (f) (and
-                      (vc-error-occurred
-                       (vc-call checkout f nil name)
-                       (if update (vc-resynch-buffer f t t))))))))))
+         (lambda (f) (vc-error-occurred
+		      (vc-call checkout f nil name)
+		      (if update (vc-resynch-buffer f t t)))))))))
 
 ;; Miscellaneous other entry points