X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ab5796a9f97180707734a81320e3eb81937281fe..09fd8197ffbbd7e7fe6339f86a3477531d20ab27:/lisp/help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index a36eed86d0..cc78bd7121 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,6 +1,7 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
-;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: FSF
@@ -21,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -121,7 +122,7 @@ and then returns."
 		     (if three-step-help
 			 (progn
 			   (setq key (let ((overriding-local-map local-map))
-				     (read-key-sequence nil)))
+				       (read-key-sequence nil)))
 			   ;; Make the HELP key translate to C-h.
 			   (if (lookup-key function-key-map key)
 			       (setq key (lookup-key function-key-map key)))
@@ -138,8 +139,9 @@ and then returns."
 				(setq new-frame (window-frame (selected-window))
 				      config nil))
 			   (setq buffer-read-only nil)
-			   (erase-buffer)
-			   (insert help-screen)
+			   (let ((inhibit-read-only t))
+			     (erase-buffer)
+			     (insert help-screen))
 			   (help-mode)
 			   (goto-char (point-min))
 			   (while (or (memq char (append help-event-list