From b61f5e45ec143ca7fb7003c55adae779c7db7965 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 25 Jul 2014 05:37:07 -0400 Subject: [PATCH] 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. --- lisp/ChangeLog | 6 ++++++ lisp/vc/ediff-init.el | 2 +- lisp/vc/ediff-util.el | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5024dadcad9..c977581df1a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-07-25 Glenn Morris + + * vc/ediff-init.el (ediff-toggle-read-only-function): + * vc/ediff-util.el (ediff-toggle-read-only): + Replace obsolete toggle-read-only with read-only-mode. + 2014-07-24 Michael Albinus * net/tramp-cache.el (tramp-flush-file-function): Wrap the code 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.") diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index dbf52479527..9ca9effbfd4 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -1027,8 +1027,8 @@ of the current buffer." (file-writable-p file))) (toggle-ro-cmd (cond (ediff-toggle-read-only-function) ((ediff-file-checked-out-p file) - 'toggle-read-only) - (file-writable 'toggle-read-only) + 'read-only-mode) + (file-writable 'read-only-mode) (t (key-binding "\C-x\C-q"))))) ;; If the file is checked in, make sure we don't make buffer modifiable ;; without warning the user. The user can fool our checks by making the @@ -1039,7 +1039,7 @@ of the current buffer." ;; non-interactively, in which case don't ask questions ctl-buf) (cond ((not buffer-read-only) - (setq toggle-ro-cmd 'toggle-read-only)) + (setq toggle-ro-cmd 'read-only-mode)) ((and (or (beep 1) t) ; always beep (y-or-n-p (format @@ -1054,13 +1054,13 @@ of the current buffer." (ediff-change-saved-variable 'buffer-read-only nil buf-type))) (t - (setq toggle-ro-cmd 'toggle-read-only) + (setq toggle-ro-cmd 'read-only-mode) (beep 1) (beep 1) (message "Boy, this is risky! Don't modify this file...") (sit-for 3)))) ; let the user see the warning (if (and toggle-ro-cmd - (string-match "toggle-read-only" (symbol-name toggle-ro-cmd))) + (string-match "read-only-mode" (symbol-name toggle-ro-cmd))) (save-excursion (save-window-excursion (select-window (ediff-get-visible-buffer-window buf)) -- 2.39.2