Add arch tagline

[bpt/emacs.git] / lisp / help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 33ee42a..eac7d44 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,7 +1,7 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
-;; Copyright (C) 1993, 1994, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: FSF
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -139,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
@@ -151,7 +152,7 @@ and then returns."
                                 (progn
                                   (if (eq (car-safe char) 'switch-frame)
                                       (handle-switch-frame char))
-                                  (if (memq char '(?\C-v ?\ ))
+                                  (if (memq char '(?\C-v ?\s))
                                       (scroll-up))
                                   (if (or (memq char '(?\177 ?\M-v
                                                        delete backspace))