Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org

[gnu-emacs] / lisp / obsolete / vc-mcvs.el

diff --git a/lisp/obsolete/vc-mcvs.el b/lisp/obsolete/vc-mcvs.el
index 06ce7f41c6551e00aeeb33ff77cda16796965a6c..dd597be32b1e23d591229ffcce9d60c12b76718c 100644 (file)
--- a/lisp/obsolete/vc-mcvs.el
+++ b/lisp/obsolete/vc-mcvs.el
@@ -1,9 +1,10 @@
 ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
 
-;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  None
+;; Obsolete-since: 23.1
 
 ;; This file is part of GNU Emacs.
 
@@ -30,9 +31,6 @@
 ;;
 ;; ********** READ THIS! **********
 
-;; This file has been obsolete and unsupported since Emacs 23.1.
-
-
 ;; The home page of the Meta-CVS version control system is at
 ;;
 ;;      http://users.footprints.net/~kaz/mcvs.html
@@ -331,7 +329,7 @@ This is only possible if Meta-CVS is responsible for FILE's directory.")
           (if vc-mcvs-use-edit
               (vc-mcvs-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-mcvs-command nil 0 file