(syms_of_xselect): Doc syntax fixes.

[gnu-emacs] / lisp / help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 886eaa52b7ae916c49552ad3d40e576a6e23caa1..8ae3876cef31ff32c9430c0d179cd5476cecad62 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
+;; Maintainer: FSF
 ;; Created: : Mon Oct  1 11:42:39 1990
 ;; Adapted-By: ESR
 
@@ -19,12 +20,13 @@
 ;; GNU General Public License for more details.
 
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
 
 ;;; Commentary:
-;;
-;;     This file supplies the macro make-help-screen which constructs
+
+;; 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
@@ -90,7 +92,7 @@ and then returns."
           (let ((line-prompt
                  (substitute-command-keys (, help-line))))
             (if three-step-help
-                (message line-prompt))
+                (message "%s" line-prompt))
             (let* ((help-screen (documentation (quote (, fname))))
                    ;; We bind overriding-local-map for very small
                    ;; sections, *excluding* where we switch buffers
@@ -104,11 +106,16 @@ and then returns."
                     (setcdr local-map (, helped-map))
                     (define-key local-map [t] 'undefined)
                     (if three-step-help
-                        (setq key (let ((overriding-local-map local-map))
-                                    (read-key-sequence nil))
-                              char (aref key 0))
+                        (progn
+                          (setq key (let ((overriding-local-map local-map))
+                                    (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)))
+                          (setq char (aref key 0)))
                       (setq char ??))
-                    (if (or (eq char ??) (eq char help-char))
+                    (if (or (eq char ??) (eq char help-char)
+                            (memq char help-event-list))
                         (progn
                           (setq config (current-window-configuration))
                           (switch-to-buffer-other-window "*Help*")
@@ -117,11 +124,13 @@ and then returns."
                                         prev-frame))
                                (setq new-frame (window-frame (selected-window))
                                      config nil))
+                          (setq buffer-read-only nil)
                           (erase-buffer)
                           (insert help-screen)
                           (help-mode)
                           (goto-char (point-min))
-                          (while (or (memq char (cons help-char '(?? ?\C-v ?\ ?\177 delete ?\M-v)))
+                          (while (or (memq char (append help-event-list
+                                                        (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace ?\M-v))))
                                      (eq (car-safe char) 'switch-frame)
                                      (equal key "\M-v"))
                             (condition-case nil
@@ -130,7 +139,8 @@ and then returns."
                                       (handle-switch-frame char))
                                   (if (memq char '(?\C-v ?\ ))
                                       (scroll-up))
-                                  (if (or (memq char '(?\177 ?\M-v delete))
+                                  (if (or (memq char '(?\177 ?\M-v
+                                                       delete backspace))
                                           (equal key "\M-v"))
                                       (scroll-down)))
                               (error nil))
@@ -142,6 +152,8 @@ and then returns."
                                                       (point-max))
                                                      "" " or Space to scroll")))
                                     char (aref key 0))))))
+                    ;; We don't need the prompt any more.
+                    (message "")
                     ;; Mouse clicks are not part of the help feature,
                     ;; so reexecute them in the standard environment.
                     (if (listp char)