(defgroup reftex): Update home page url-link.

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

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index becc168..cc78bd7 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,10 +1,11 @@
-;;; help-macro.el --- Makes command line help such as help-for-help
+;;; 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
-;; Created: : Mon Oct  1 11:42:39 1990
+;; Created: Mon Oct  1 11:42:39 1990
 ;; Adapted-By: ESR
 
 ;; This file is part of GNU Emacs.
@@ -21,15 +22,15 @@
 
 ;; 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:
 
 ;; This file supplies the macro make-help-screen which constructs
 ;; single character dispatching with browsable help such as that provided
 ;; by help-for-help. This can be used to make many modes easier to use; for
-;; example, the Gnu Emacs Empire Tool uses this for every "nested" mode map
+;; example, the GNU Emacs Empire Tool uses this for every "nested" mode map
 ;; called from the main mode map.
 
 ;;       The name of this package was changed from help-screen.el to
@@ -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,12 +139,13 @@ 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
-                                                        (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace vertical-scroll-bar ?\M-v))))
+                                                        (cons help-char '(?? ?\C-v ?\s ?\177 delete backspace vertical-scroll-bar ?\M-v))))
                                      (eq (car-safe char) 'switch-frame)
                                      (equal key "\M-v"))
                             (condition-case nil
@@ -196,4 +198,5 @@ and then returns."
 
 (provide 'help-macro)
 
+;;; arch-tag: 59fee949-1686-485a-8a05-83418073e257
 ;;; help-macro.el ends here