diff options
| -rw-r--r-- | lisp/help-macro.el | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 8ae3876cef3..e047715b4ab 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el | |||
| @@ -105,6 +105,9 @@ and then returns." | |||
| 105 | (progn | 105 | (progn |
| 106 | (setcdr local-map (, helped-map)) | 106 | (setcdr local-map (, helped-map)) |
| 107 | (define-key local-map [t] 'undefined) | 107 | (define-key local-map [t] 'undefined) |
| 108 | ;; Make the scroll bar keep working normally. | ||
| 109 | (define-key local-map [vertical-scroll-bar] | ||
| 110 | (lookup-key global-map [vertical-scroll-bar])) | ||
| 108 | (if three-step-help | 111 | (if three-step-help |
| 109 | (progn | 112 | (progn |
| 110 | (setq key (let ((overriding-local-map local-map)) | 113 | (setq key (let ((overriding-local-map local-map)) |
| @@ -130,7 +133,7 @@ and then returns." | |||
| 130 | (help-mode) | 133 | (help-mode) |
| 131 | (goto-char (point-min)) | 134 | (goto-char (point-min)) |
| 132 | (while (or (memq char (append help-event-list | 135 | (while (or (memq char (append help-event-list |
| 133 | (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace ?\M-v)))) | 136 | (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace vertical-scroll-bar ?\M-v)))) |
| 134 | (eq (car-safe char) 'switch-frame) | 137 | (eq (car-safe char) 'switch-frame) |
| 135 | (equal key "\M-v")) | 138 | (equal key "\M-v")) |
| 136 | (condition-case nil | 139 | (condition-case nil |
| @@ -151,7 +154,11 @@ and then returns." | |||
| 151 | (if (pos-visible-in-window-p | 154 | (if (pos-visible-in-window-p |
| 152 | (point-max)) | 155 | (point-max)) |
| 153 | "" " or Space to scroll"))) | 156 | "" " or Space to scroll"))) |
| 154 | char (aref key 0)))))) | 157 | char (aref key 0))) |
| 158 | |||
| 159 | ;; If this is a scroll bar command, just run it. | ||
| 160 | (when (eq char 'vertical-scroll-bar) | ||
| 161 | (command-execute (lookup-key local-map key) nil key))))) | ||
| 155 | ;; We don't need the prompt any more. | 162 | ;; We don't need the prompt any more. |
| 156 | (message "") | 163 | (message "") |
| 157 | ;; Mouse clicks are not part of the help feature, | 164 | ;; Mouse clicks are not part of the help feature, |