[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117572: ediff: Replace obsolete toggle-read-only wi
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117572: ediff: Replace obsolete toggle-read-only with read-only-mode |
Date: |
Fri, 25 Jul 2014 09:37:18 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117572
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-07-25 05:37:07 -0400
message:
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/ediff-init.el
ediffinit.el-20091113204419-o5vbwnq5f7feedwu-846
lisp/vc/ediff-util.el
ediffutil.el-20091113204419-o5vbwnq5f7feedwu-848
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-07-24 07:30:36 +0000
+++ b/lisp/ChangeLog 2014-07-25 09:37:07 +0000
@@ -1,3 +1,9 @@
+2014-07-25 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* net/tramp-cache.el (tramp-flush-file-function): Wrap the code
=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el 2014-06-18 08:54:11 +0000
+++ b/lisp/vc/ediff-init.el 2014-07-25 09:37:07 +0000
@@ -1346,7 +1346,7 @@
(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.")
=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el 2014-05-03 02:27:46 +0000
+++ b/lisp/vc/ediff-util.el 2014-07-25 09:37:07 +0000
@@ -1027,8 +1027,8 @@
(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 @@
;; 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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117572: ediff: Replace obsolete toggle-read-only with read-only-mode,
Glenn Morris <=