summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-07-25 05:37:07 -0400
committerGlenn Morris <rgm@gnu.org>2014-07-25 05:37:07 -0400
commitb61f5e45ec143ca7fb7003c55adae779c7db7965 (patch)
treeabcaf4345adc16cf62dc83ac81dfb2fb55b34e38 /lisp/vc/ediff-init.el
parentc3dfb46e1c4ee289c0c2b8f6454aba3480e8f1de (diff)
downloademacs-b61f5e45ec143ca7fb7003c55adae779c7db7965.tar.gz
ediff: Replace obsolete toggle-read-only with read-only-mode
* lisp/vc/ediff-init.el (ediff-toggle-read-only-function): * lisp/vc/ediff-util.el (ediff-toggle-read-only): Replace obsolete toggle-read-only with read-only-mode.
Diffstat (limited to 'lisp/vc/ediff-init.el')
-rw-r--r--lisp/vc/ediff-init.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index af45acd3c37..589ea454965 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -1346,7 +1346,7 @@ this variable represents.")
(ediff-defvar-local ediff-current-diff-overlay-Ancestor nil
"Overlay for the current difference region in the ancestor buffer.")
-(defvar ediff-toggle-read-only-function 'toggle-read-only
+(defvar ediff-toggle-read-only-function 'read-only-mode
"Function to be used to toggle read-only status of the buffer.
If nil, Ediff tries using the command bound to C-x C-q.")