mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-28 10:56:36 +00:00
Code Issues Releases Activity

(vc-next-action-on-file): Only force buffer+file to writable

Browse Source 
if both the buffer and the file are read-only.
This commit is contained in:
Stefan Monnier 2001-05-03 00:36:07 +00:00
parent b36581fba0
commit fd8092f01b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/vc.el
View File

@ -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