[Emacs-diffs] emacs-24 r117400: More toggle-read-only doc tweaks

[Glenn Morris]

------------------------------------------------------------
revno: 117400
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-07-25 05:24:53 -0400
message:
  More toggle-read-only doc tweaks
  
  * lisp/files.el (toggle-read-only): Re-add basic doc-string.
  
  * lisp/vc/vc-hooks.el (vc-toggle-read-only): Tweak obsolescence mesage.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/files.el                  files.el-20091113204419-o5vbwnq5f7feedwu-265
  lisp/vc/vc-hooks.el            vchooks.el-20091113204419-o5vbwnq5f7feedwu-501

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-25 08:24:00 +0000
+++ b/lisp/ChangeLog    2014-07-25 09:24:53 +0000
@@ -1,5 +1,8 @@
 2014-07-25  Glenn Morris  <address@hidden>
 
+       * files.el (toggle-read-only): Re-add basic doc-string.
+       * vc/vc-hooks.el (vc-toggle-read-only): Tweak obsolescence mesage.
+
        * progmodes/prolog.el (prolog-mode-keybindings-edit):
        Replace missing `switch-to-prolog' with `run-prolog'.
        (switch-to-prolog): Define as (obsolete) alias, as in 23.4.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2014-07-21 05:38:17 +0000
+++ b/lisp/files.el     2014-07-25 09:24:53 +0000
@@ -5012,6 +5012,7 @@
   (set-buffer-modified-p arg))
 
 (defun toggle-read-only (&optional arg interactive)
+  "Change whether this buffer is read-only."
   (declare (obsolete read-only-mode "24.3"))
   (interactive (list current-prefix-arg t))
   (if interactive

=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el       2014-01-01 07:43:34 +0000
+++ b/lisp/vc/vc-hooks.el       2014-07-25 09:24:53 +0000
@@ -628,8 +628,15 @@
               (throw 'found trial))))
        templates))))
 
-(define-obsolete-function-alias
-  'vc-toggle-read-only 'toggle-read-only "24.1")
+
+;; toggle-read-only is obsolete since 24.3, but since vc-t-r-o was made
+;; obsolete earlier, it is ok for the latter to be an alias to the former,
+;; since the latter will be removed first.  We can't just make it
+;; an alias for read-only-mode, since that is not 100% the same.
+(defalias 'vc-toggle-read-only 'toggle-read-only)
+(make-obsolete 'vc-toggle-read-only
+               "use `read-only-mode' instead (or `toggle-read-only' in older 
version of Emacs)."
+               "24.1")
 
 (defun vc-default-make-version-backups-p (_backend _file)
   "Return non-nil if unmodified versions should be backed up locally.