Merge from emacs-24; up to 2014-06-25T10:17:41Z!rgm@gnu.org

[gnu-emacs] / lisp / progmodes / hideif.el

diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index d60c009e66d6566d4c067d18f1056dbf04cb7c9b..b1eaa6ad66c1d914d287e4c2c45b6116855ba1af 100644 (file)
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -188,6 +188,9 @@ Effective only if `hide-ifdef-expand-reinclusion-protection' is t."
 
     (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)
@@ -1789,7 +1792,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"