Merge from emacs-23

[gnu-emacs] / lisp / scroll-all.el

diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index f07041c3114d7fca14398d6a07b840db0dc7d0df..b152970825f1c2fa6cc784d5ddf3de5b6026079f 100644 (file)
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -90,9 +90,9 @@
         (call-interactively 'scroll-all-scroll-down-all))
        ((eq this-command 'previous-line)
         (call-interactively 'scroll-all-scroll-up-all))
-       ((eq this-command 'scroll-up)
+       ((memq this-command '(scroll-up scroll-up-command))
         (call-interactively 'scroll-all-page-down-all))
-       ((eq this-command 'scroll-down)
+       ((memq this-command '(scroll-down scroll-down-command))
         (call-interactively 'scroll-all-page-up-all))
        ((eq this-command 'beginning-of-buffer)
         (call-interactively 'scroll-all-beginning-of-buffer-all))