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

(make-help-screen): Use overriding-local-map.

Recognize C-v and M-v properly.
Compute help-screen after changing the map.
parent 60724eab
......@@ -82,17 +82,16 @@ and then returns."
(, help-text)
(let ((line-prompt
(substitute-command-keys (, help-line)))
(help-screen (documentation (quote (, fname)))))
(substitute-command-keys (, help-line))))
(message line-prompt)
(let ((old-local-map (current-local-map))
(old-global-map (current-global-map))
(let* ((overriding-local-map (make-sparse-keymap))
(minor-mode-map-alist nil)
config key char)
config key char help-screen)
(use-global-map (, helped-map))
(use-local-map nil)
(setcdr overriding-local-map (, helped-map))
(define-key overriding-local-map [t] 'undefined)
(setq help-screen (documentation (quote (, fname))))
(setq key (read-key-sequence nil))
(setq char (aref key 0))
(if (or (eq char ??) (eq char help-char))
......@@ -102,12 +101,15 @@ and then returns."
(insert help-screen)
(goto-char (point-min))
(while (memq char (cons help-char '(?? ?\C-v ?\ ?\177 ?\M-v)))
(while (or (memq char (cons help-char '(?? ?\C-v ?\ ?\177 ?\M-v)))
(equal key "\M-v"))
(setq list (cons key list))
(condition-case nil
(if (memq char '(?\C-v ?\ ))
(if (memq char '(?\177 ?\M-v))
(if (or (memq char '(?\177 ?\M-v))
(equal key "\M-v"))
(error nil))
(message "%s%s: "
......@@ -116,7 +118,8 @@ and then returns."
"" " or Space to scroll"))
(let ((cursor-in-echo-area t))
(setq key (read-key-sequence nil)
char (aref key 0))))))
char (aref key 0))))
(setq list (cons key list))))
;; Mouse clicks are not part of the help feature,
;; so reexecute them in the standard environment.
(if (listp char)
......@@ -130,12 +133,9 @@ and then returns."
(set-window-configuration config)
(setq config nil)))
(use-local-map old-local-map)
(use-global-map old-global-map)
(setq overriding-local-map nil)
(call-interactively defn))
(use-local-map old-local-map)
(use-global-map old-global-map)
(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