X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/1ca576b5b6c0366d383f1e57257f6df66af76ebd..22cc6690e717501adc7dcbb19ec910a4009e92ca:/lisp/help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 1001986c16..096de16ee2 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,12 +1,10 @@
 ;;; help-macro.el --- Makes command line help such as help-for-help
 
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Created: : Mon Oct  1 11:42:39 1990
 ;; Adapted-By: ESR
-;; Last Modified By: Lynn Slater x2048
-;; Last Modified On: Mon Sep 23 14:40:19 1991
 
 ;; This file is part of GNU Emacs.
 
@@ -82,7 +80,7 @@ A value of nil means skip the middle step, so that
 (defmacro make-help-screen (fname help-line help-text helped-map)
   "Construct help-menu function name FNAME.
 When invoked, FNAME shows HELP-LINE and reads a command using HELPED-MAP.
-If the command is the help character is requested, FNAME displays HELP-TEXT
+If the command is the help character, FNAME displays HELP-TEXT
 and continues trying to read a command using HELPED-MAP.
 When FNAME finally does get a command, it executes that command
 and then returns."
@@ -93,36 +91,58 @@ and then returns."
 		  (substitute-command-keys (, help-line))))
 	     (if three-step-help
 		 (message line-prompt))
-	     (let* ((overriding-local-map (make-sparse-keymap))
+	     (let* ((help-screen (documentation (quote (, fname))))
+		    ;; We bind overriding-local-map for very small
+		    ;; sections, *excluding* where we switch buffers
+		    ;; and where we execute the chosen help command.
+		    (local-map (make-sparse-keymap))
 		    (minor-mode-map-alist nil)
-		    config key char help-screen)
+		    (prev-frame (selected-frame))
+		    config new-frame key char)
 	       (unwind-protect
 		   (progn
-		     (setcdr overriding-local-map (, helped-map))
-		     (define-key overriding-local-map [t] 'undefined)
-		     (setq help-screen (documentation (quote (, fname))))
+		     (setcdr local-map (, helped-map))
+		     (define-key local-map [t] 'undefined)
 		     (if three-step-help
-			 (setq key (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*")
+			   (and (fboundp 'make-frame)
+				(not (eq (window-frame (selected-window))
+					 prev-frame))
+				(setq new-frame (window-frame (selected-window))
+				      config 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
 				 (progn
+				   (if (eq (car-safe char) 'switch-frame)
+				       (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))
-			     (let ((cursor-in-echo-area t))
+			     (let ((cursor-in-echo-area t)
+				   (overriding-local-map local-map))
 			       (setq key (read-key-sequence
 					  (format "Type one of the options listed%s: "
 						  (if (pos-visible-in-window-p
@@ -135,16 +155,19 @@ and then returns."
 			 (setq unread-command-events
 			       (cons char unread-command-events)
 			       config nil)
-		       (let ((defn (key-binding key)))
+		       (let ((defn (lookup-key local-map key)))
 			 (if defn
 			     (progn
 			       (if config
 				   (progn
 				     (set-window-configuration config)
 				     (setq config nil)))
-			       (setq overriding-local-map nil)
+			       (if new-frame
+				   (progn (iconify-frame new-frame)
+					  (setq new-frame nil)))
 			       (call-interactively defn))
 			   (ding)))))
+		 (if new-frame (iconify-frame new-frame))
 		 (if config
 		     (set-window-configuration config))))))
      ))