summaryrefslogtreecommitdiff
path: root/lisp/scroll-all.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@etlken>2010-05-14 13:15:58 +0900
committerKenichi Handa <handa@etlken>2010-05-14 13:15:58 +0900
commitccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c (patch)
tree0f53c077154c7cd5f05b339d91905dfd2391679d /lisp/scroll-all.el
parent82ebc97b11a369303345927c98e7bc69928c9117 (diff)
parent508197067c434b0111bcb6ded742d424bb738ece (diff)
downloademacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.tar.gz
emacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.tar.bz2
emacs-ccd3ce49e08b4f0c0e1bcbb34e9055ca4002e21c.zip
merge trunk
Diffstat (limited to 'lisp/scroll-all.el')
-rw-r--r--lisp/scroll-all.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 458e2be07a1..4f9747cb90a 100644
--- 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))