summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-08-29 11:11:51 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-08-29 11:11:51 -0400
commit35e62fc984b108f717c5525ffecf60586eb0737e (patch)
treefd00c70fbf024b7e5290086bcbc8a9f226a30a03 /lisp/vc
parentc2c43c2382db292bfe3cccbccad4386f81f9c8a4 (diff)
downloademacs-35e62fc984b108f717c5525ffecf60586eb0737e.tar.gz
* lisp/files.el (read-only-mode): New minor mode.
(toggle-read-only): Use it and mark obsolete. (find-file--read-only): * lisp/vc/vc.el (vc-next-action, vc-checkout): * lisp/vc/vc-cvs.el (vc-cvs-checkout): * lisp/obsolete/vc-mcvs.el (vc-mcvs-update): * lisp/ffap.el (ffap--toggle-read-only): Update callers.
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc-cvs.el2
-rw-r--r--lisp/vc/vc.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index c1c4b750267..ae1a3cf92f8 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -394,7 +394,7 @@ REV is the revision to check out."
(if vc-cvs-use-edit
(vc-cvs-command nil 0 file "edit")
(set-file-modes file (logior (file-modes file) 128))
- (if (equal file buffer-file-name) (toggle-read-only -1))))
+ (if (equal file buffer-file-name) (read-only-mode -1))))
;; Check out a particular revision (or recreate the file).
(vc-file-setprop file 'vc-working-revision nil)
(apply 'vc-cvs-command nil 0 file
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index ddb9565544d..1ef4faaa008 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1133,7 +1133,7 @@ For old-style locking-based version control systems, like RCS:
(let ((visited (get-file-buffer file)))
(when visited
(with-current-buffer visited
- (toggle-read-only -1))))))
+ (read-only-mode -1))))))
;; Allow user to revert files with no changes
(save-excursion
(dolist (file files)
@@ -1344,7 +1344,7 @@ After check-out, runs the normal hook `vc-checkout-hook'."
;; Maybe the backend is not installed ;-(
(when writable
(let ((buf (get-file-buffer file)))
- (when buf (with-current-buffer buf (toggle-read-only -1)))))
+ (when buf (with-current-buffer buf (read-only-mode -1)))))
(signal (car err) (cdr err))))
`((vc-state . ,(if (or (eq (vc-checkout-model backend (list file)) 'implicit)
(not writable))