Commit 8d2b0a2d authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(make-help-screen): Handle case where *Help* comes up in a separate frame.

parent d536293f
......@@ -99,7 +99,8 @@ and then returns."
;; and where we execute the chosen help command.
(local-map (make-sparse-keymap))
(minor-mode-map-alist nil)
config key char)
(prev-frame (selected-frame))
config new-frame key char)
(setcdr local-map (, helped-map))
......@@ -113,13 +114,20 @@ and then returns."
(setq config (current-window-configuration))
(switch-to-buffer-other-window "*Help*")
(if (not (eq (window-frame (selected-window))
(setq new-frame (window-frame (selected-window))
config nil))
(insert help-screen)
(goto-char (point-min))
(while (or (memq char (cons help-char '(?? ?\C-v ?\ ?\177 delete ?\M-v)))
(eq (car-safe char) 'switch-frame)
(equal key "\M-v"))
(condition-case nil
(if (eq (car-safe char) 'switch-frame)
(handle-switch-frame char))
(if (memq char '(?\C-v ?\ ))
(if (or (memq char '(?\177 ?\M-v delete))
......@@ -149,9 +157,12 @@ and then returns."
(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))
(if new-frame (iconify-frame new-frame))
(if config
(set-window-configuration config))))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment