(appt-mode-string): New variable.

[gnu-emacs] / lisp / help-macro.el

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 8ae3876cef31ff32c9430c0d179cd5476cecad62..366466142de68c83f41891cefcf4b2a8460ec4c5 100644 (file)
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -105,6 +105,9 @@ and then returns."
                   (progn
                     (setcdr local-map (, helped-map))
                     (define-key local-map [t] 'undefined)
+                    ;; Make the scroll bar keep working normally.
+                    (define-key local-map [vertical-scroll-bar]
+                      (lookup-key global-map [vertical-scroll-bar]))
                     (if three-step-help
                         (progn
                           (setq key (let ((overriding-local-map local-map))
@@ -130,7 +133,7 @@ and then returns."
                           (help-mode)
                           (goto-char (point-min))
                           (while (or (memq char (append help-event-list
-                                                        (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace ?\M-v))))
+                                                        (cons help-char '(?? ?\C-v ?\ ?\177 delete backspace vertical-scroll-bar ?\M-v))))
                                      (eq (car-safe char) 'switch-frame)
                                      (equal key "\M-v"))
                             (condition-case nil
@@ -150,8 +153,12 @@ and then returns."
                                          (format "Type one of the options listed%s: "
                                                  (if (pos-visible-in-window-p
                                                       (point-max))
-                                                     "" " or Space to scroll")))
-                                    char (aref key 0))))))
+                                                     "" ", or SPACE or DEL to scroll")))
+                                    char (aref key 0)))
+
+                            ;; If this is a scroll bar command, just run it.
+                            (when (eq char 'vertical-scroll-bar)
+                              (command-execute (lookup-key local-map key) nil key)))))
                     ;; We don't need the prompt any more.
                     (message "")
                     ;; Mouse clicks are not part of the help feature,