From 59bb37859d1a64518fca9bfe80c57eba862f905f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 25 Jul 2014 05:24:53 -0400 Subject: [PATCH] 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. --- lisp/ChangeLog | 3 +++ lisp/files.el | 1 + lisp/vc/vc-hooks.el | 11 +++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed9801b4101..c2bdbdebab6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-07-25 Glenn Morris + * 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. diff --git a/lisp/files.el b/lisp/files.el index a5cee47ee8a..6c3b8f4fa4d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5012,6 +5012,7 @@ prints a message in the minibuffer. Instead, use `set-buffer-modified-p'." (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 diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 1cd297ae43a..8151e43a9f1 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -628,8 +628,15 @@ this function." (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. -- 2.39.5