From: Glenn Morris Date: Mon, 21 Jul 2014 05:38:17 +0000 (-0400) Subject: Small fixes re toggle-read-only, mainly doc X-Git-Tag: emacs-24.3.93~51 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6c951e5d2ce79fe673965a1cee55a34048de612;p=emacs.git Small fixes re toggle-read-only, mainly doc * progmodes/hideif.el (hide-ifdef-mode-submap): Also substitute read-only-mode. * bindings.el (mode-line-toggle-read-only): * bs.el (bs-toggle-readonly): * buff-menu.el (Buffer-menu-toggle-read-only): * dired.el (dired-toggle-read-only): * files.el (view-read-only, find-file-read-only) (find-file-read-only-other-window) (find-file-read-only-other-frame): * progmodes/hideif.el (hide-ifdef-toggle-outside-read-only): Doc fixes re toggle-read-only. * view.el: Comment updates. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2ee5ee808c1..6c6e7543c29 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2014-07-21 Glenn Morris + + * progmodes/hideif.el (hide-ifdef-mode-submap): + Also substitute read-only-mode. + * bindings.el (mode-line-toggle-read-only): + * bs.el (bs-toggle-readonly): + * buff-menu.el (Buffer-menu-toggle-read-only): + * dired.el (dired-toggle-read-only): + * files.el (view-read-only, find-file-read-only) + (find-file-read-only-other-window) + (find-file-read-only-other-frame): + * progmodes/hideif.el (hide-ifdef-toggle-outside-read-only): + Doc fixes re toggle-read-only. + 2014-07-20 Fabián Ezequiel Gallina * progmodes/python.el: Add comment about pipe buffering and diff --git a/lisp/bindings.el b/lisp/bindings.el index 911ab63e8d0..ac31723e02d 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -36,7 +36,7 @@ corresponding to the mode line clicked." (defun mode-line-toggle-read-only (event) - "Like `toggle-read-only', for the mode-line." + "Like toggling `read-only-mode', for the mode-line." (interactive "e") (with-selected-window (posn-window (event-start event)) (read-only-mode 'toggle))) diff --git a/lisp/bs.el b/lisp/bs.el index f0f8b1dc351..0348b95a1ef 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -954,7 +954,7 @@ Default is `bs--current-sort-function'." (defun bs-toggle-readonly () "Toggle read-only status for buffer on current line. -Uses function `toggle-read-only'." +Uses function `read-only-mode'." (interactive) (with-current-buffer (bs--current-buffer) (read-only-mode 'toggle)) diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index d85caca6216..f1772b3d20c 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -539,7 +539,7 @@ The current window remains selected." (defun Buffer-menu-toggle-read-only () "Toggle read-only status of buffer on this line. -This behaves like invoking \\[toggle-read-only] in that buffer." +This behaves like invoking \\[read-only-mode] in that buffer." (interactive) (let ((read-only (with-current-buffer (Buffer-menu-buffer t) diff --git a/lisp/dired.el b/lisp/dired.el index e4f297e8cc8..60f8c1e9dfc 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2015,7 +2015,7 @@ Actual changes in files cannot be undone by Emacs.")) "Edit Dired buffer with Wdired, or make it read-only. If the current buffer can be edited with Wdired, (i.e. the major mode is `dired-mode'), call `wdired-change-to-wdired-mode'. -Otherwise, call `toggle-read-only'." +Otherwise, toggle `read-only-mode'." (interactive) (if (derived-mode-p 'dired-mode) (wdired-change-to-wdired-mode) diff --git a/lisp/files.el b/lisp/files.el index 718421b1899..a5cee47ee8a 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -572,7 +572,7 @@ A value of nil means ignore them; anything else means query." In fact, this means that all read-only buffers normally have View mode enabled, including buffers that are read-only because you visit a file you cannot alter, and buffers you make read-only -using \\[toggle-read-only]." +using \\[read-only-mode]." :type 'boolean :group 'view) @@ -1517,7 +1517,7 @@ file names with wildcards." (defun find-file-read-only (filename &optional wildcards) "Edit file FILENAME but don't allow changes. Like \\[find-file], but marks buffer as read-only. -Use \\[toggle-read-only] to permit editing." +Use \\[read-only-mode] to permit editing." (interactive (find-file-read-args "Find file read-only: " (confirm-nonexistent-file-or-buffer))) @@ -1526,7 +1526,7 @@ Use \\[toggle-read-only] to permit editing." (defun find-file-read-only-other-window (filename &optional wildcards) "Edit file FILENAME in another window but don't allow changes. Like \\[find-file-other-window], but marks buffer as read-only. -Use \\[toggle-read-only] to permit editing." +Use \\[read-only-mode] to permit editing." (interactive (find-file-read-args "Find file read-only other window: " (confirm-nonexistent-file-or-buffer))) @@ -1535,7 +1535,7 @@ Use \\[toggle-read-only] to permit editing." (defun find-file-read-only-other-frame (filename &optional wildcards) "Edit file FILENAME in another frame but don't allow changes. Like \\[find-file-other-frame], but marks buffer as read-only. -Use \\[toggle-read-only] to permit editing." +Use \\[read-only-mode] to permit editing." (interactive (find-file-read-args "Find file read-only other frame: " (confirm-nonexistent-file-or-buffer))) diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 39ad676f593..506f2c2364e 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -149,6 +149,9 @@ (define-key map "\C-q" 'hide-ifdef-toggle-read-only) (define-key map "\C-w" 'hide-ifdef-toggle-shadowing) + (substitute-key-definition + 'read-only-mode 'hide-ifdef-toggle-outside-read-only map) + ;; `toggle-read-only' is obsoleted by `read-only-mode'. (substitute-key-definition 'toggle-read-only 'hide-ifdef-toggle-outside-read-only map) map) @@ -1049,7 +1052,7 @@ It does not do the work that's pointless to redo on a recursive entry." (force-mode-line-update)) (defun hide-ifdef-toggle-outside-read-only () - "Replacement for `toggle-read-only' within Hide-Ifdef mode." + "Replacement for `read-only-mode' within Hide-Ifdef mode." (interactive) (setq hif-outside-read-only (not hif-outside-read-only)) (message "Read only %s" diff --git a/lisp/view.el b/lisp/view.el index a5992ccb62a..9f914b03f56 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -491,12 +491,12 @@ Entry to view-mode runs the normal hook `view-mode-hook'." (defun view--disable () (remove-hook 'change-major-mode-hook 'view--disable t) (and view-overlay (delete-overlay view-overlay)) - ;; Calling toggle-read-only while View mode is enabled + ;; Calling read-only-mode while View mode is enabled ;; sets view-read-only to t as a buffer-local variable - ;; after exiting View mode. That arranges that the next toggle-read-only + ;; after exiting View mode. That arranges that the next read-only-mode ;; will reenable View mode. ;; Canceling View mode in any other way should cancel that, too, - ;; so that View mode stays off if toggle-read-only is called. + ;; so that View mode stays off if read-only-mode is called. (if (local-variable-p 'view-read-only) (kill-local-variable 'view-read-only)) (if (boundp 'Helper-return-blurb)