* scroll-all.el (scroll-all-check-to-scroll):

Add `scroll-up-command' and `scroll-down-command' (bug#6164).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1189b7c..92edd9b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Juri Linkov  <juri@jurta.org>
+
+       * scroll-all.el (scroll-all-check-to-scroll):
+       Add `scroll-up-command' and `scroll-down-command' (bug#6164).
+
 2010-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * iimage.el (iimage-mode-map): Move initialization into declaration.

diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 458e2be..4f9747c 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))