diff options
author | Juri Linkov <juri@jurta.org> | 2010-05-11 22:42:21 +0300 |
---|---|---|
committer | Juri Linkov <juri@jurta.org> | 2010-05-11 22:42:21 +0300 |
commit | 841c4085a8087b8c5bc138d5129f7e07f3e18f5f (patch) | |
tree | 226c292b91789088ba1979179a83a466f2e7dc4c | |
parent | f2b9ed185adcd8e49934ebaa9247cac49dcc0d1b (diff) | |
download | emacs-841c4085a8087b8c5bc138d5129f7e07f3e18f5f.tar.gz emacs-841c4085a8087b8c5bc138d5129f7e07f3e18f5f.tar.bz2 emacs-841c4085a8087b8c5bc138d5129f7e07f3e18f5f.zip |
* scroll-all.el (scroll-all-check-to-scroll):
Add `scroll-up-command' and `scroll-down-command' (bug#6164).
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/scroll-all.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1189b7c658c..92edd9b380c 100644 --- 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 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)) |