summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-hooks.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-07-25 05:24:53 -0400
committerGlenn Morris <rgm@gnu.org>2014-07-25 05:24:53 -0400
commit59bb37859d1a64518fca9bfe80c57eba862f905f (patch)
tree025a36f8ca54dee5347656417c54cc585aefd900 /lisp/vc/vc-hooks.el
parent25aa0da588f2afb629e6b42612ccc8925da41a46 (diff)
downloademacs-59bb37859d1a64518fca9bfe80c57eba862f905f.tar.gz
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.
Diffstat (limited to 'lisp/vc/vc-hooks.el')
-rw-r--r--lisp/vc/vc-hooks.el11
1 files changed, 9 insertions, 2 deletions
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.