diff options
| -rw-r--r-- | lisp/help-macro.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/help-macro.el b/lisp/help-macro.el index bd129a8aed8..096de16ee2c 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el | |||
| @@ -112,7 +112,8 @@ and then returns." | |||
| 112 | (setq key (lookup-key function-key-map key))) | 112 | (setq key (lookup-key function-key-map key))) |
| 113 | (setq char (aref key 0))) | 113 | (setq char (aref key 0))) |
| 114 | (setq char ??)) | 114 | (setq char ??)) |
| 115 | (if (or (eq char ??) (eq char help-char)) | 115 | (if (or (eq char ??) (eq char help-char) |
| 116 | (memq char help-event-list)) | ||
| 116 | (progn | 117 | (progn |
| 117 | (setq config (current-window-configuration)) | 118 | (setq config (current-window-configuration)) |
| 118 | (switch-to-buffer-other-window "*Help*") | 119 | (switch-to-buffer-other-window "*Help*") |
| @@ -125,7 +126,8 @@ and then returns." | |||
| 125 | (insert help-screen) | 126 | (insert help-screen) |
| 126 | (help-mode) | 127 | (help-mode) |
| 127 | (goto-char (point-min)) | 128 | (goto-char (point-min)) |
| 128 | (while (or (memq char (cons help-char '(?? ?\C-v ?\ ?\177 delete ?\M-v))) | 129 | (while (or (memq char (append help-event-list |
| 130 | (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace ?\M-v)))) | ||
| 129 | (eq (car-safe char) 'switch-frame) | 131 | (eq (car-safe char) 'switch-frame) |
| 130 | (equal key "\M-v")) | 132 | (equal key "\M-v")) |
| 131 | (condition-case nil | 133 | (condition-case nil |
| @@ -134,7 +136,8 @@ and then returns." | |||
| 134 | (handle-switch-frame char)) | 136 | (handle-switch-frame char)) |
| 135 | (if (memq char '(?\C-v ?\ )) | 137 | (if (memq char '(?\C-v ?\ )) |
| 136 | (scroll-up)) | 138 | (scroll-up)) |
| 137 | (if (or (memq char '(?\177 ?\M-v delete)) | 139 | (if (or (memq char '(?\177 ?\M-v |
| 140 | delete backspace)) | ||
| 138 | (equal key "\M-v")) | 141 | (equal key "\M-v")) |
| 139 | (scroll-down))) | 142 | (scroll-down))) |
| 140 | (error nil)) | 143 | (error nil)) |