diff options
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/emulation/cua-rect.el | 2 | ||||
| -rw-r--r-- | lisp/forms.el | 4 | ||||
| -rw-r--r-- | lisp/image-mode.el | 2 | ||||
| -rw-r--r-- | lisp/tutorial.el | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/window.c | 4 |
7 files changed, 28 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8baac73bd9a..01bfbf55434 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,16 @@ 2010-04-14 Juri Linkov <juri@jurta.org> + * tutorial.el (tutorial--default-keys): Rebind `C-v' to + `scroll-up-command' and `M-v' to `scroll-down-command'. + + * emulation/cua-rect.el (cua--init-rectangles): + * forms.el (forms--change-commands): + * image-mode.el (image-mode-map): + Remap scroll-down-command and scroll-up-command + in addition to scroll-down and scroll-up. + +2010-04-14 Juri Linkov <juri@jurta.org> + * mwheel.el (scroll-preserve-screen-position-commands): Add mwheel-scroll to this list of commands. diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 4398b5aa1af..4ac8ce58b3e 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -1432,6 +1432,8 @@ With prefix arg, indent to that column." (define-key cua--rectangle-keymap [remap beginning-of-buffer] 'cua-resize-rectangle-top) (define-key cua--rectangle-keymap [remap scroll-down] 'cua-resize-rectangle-page-up) (define-key cua--rectangle-keymap [remap scroll-up] 'cua-resize-rectangle-page-down) + (define-key cua--rectangle-keymap [remap scroll-down-command] 'cua-resize-rectangle-page-up) + (define-key cua--rectangle-keymap [remap scroll-up-command] 'cua-resize-rectangle-page-down) (define-key cua--rectangle-keymap [remap delete-backward-char] 'cua-delete-char-rectangle) (define-key cua--rectangle-keymap [remap backward-delete-char] 'cua-delete-char-rectangle) diff --git a/lisp/forms.el b/lisp/forms.el index acb86dcc194..50f7ac9f506 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -1407,7 +1407,9 @@ Commands: Equivalent keys in read-only mode: (if forms-forms-scroll (progn (local-set-key [remap scroll-up] 'forms-next-record) - (local-set-key [remap scroll-down] 'forms-prev-record))) + (local-set-key [remap scroll-down] 'forms-prev-record) + (local-set-key [remap scroll-up-command] 'forms-next-record) + (local-set-key [remap scroll-down-command] 'forms-prev-record))) ;; ;; beginning-of-buffer -> forms-first-record ;; end-of-buffer -> forms-end-record diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 6169fa4cb71..cd292a8fa3b 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -302,6 +302,8 @@ This variable is used to display the current image type in the mode line.") (define-key map [remap next-line] 'image-next-line) (define-key map [remap scroll-up] 'image-scroll-up) (define-key map [remap scroll-down] 'image-scroll-down) + (define-key map [remap scroll-up-command] 'image-scroll-up) + (define-key map [remap scroll-down-command] 'image-scroll-down) (define-key map [remap move-beginning-of-line] 'image-bol) (define-key map [remap move-end-of-line] 'image-eol) (define-key map [remap beginning-of-buffer] 'image-bob) diff --git a/lisp/tutorial.el b/lisp/tutorial.el index de7f7ab4a3c..0ac315ac6dc 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -218,8 +218,8 @@ LEFT and RIGHT are the elements to compare." (save-buffers-kill-terminal [?\C-x ?\C-c]) ;; * SUMMARY - (scroll-up [?\C-v]) - (scroll-down [?\M-v]) + (scroll-up-command [?\C-v]) + (scroll-down-command [?\M-v]) (recenter-top-bottom [?\C-l]) ;; * BASIC CURSOR CONTROL diff --git a/src/ChangeLog b/src/ChangeLog index e4130a64838..82484b105be 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2010-04-14 Juri Linkov <juri@jurta.org> + * window.c (keys_of_window): Rebind `C-v' from `scroll-up' to + `scroll-up-command' and `M-v' from `scroll-down' to + `scroll-down-command'. + +2010-04-14 Juri Linkov <juri@jurta.org> + * window.c (Vscroll_preserve_screen_position_commands): New variable with the default value as the list of Qscroll_down and Qscroll_up. (window_scroll_pixel_based, window_scroll_line_based): Search the diff --git a/src/window.c b/src/window.c index 2757b98ddd9..b9683fbbca8 100644 --- a/src/window.c +++ b/src/window.c @@ -7391,9 +7391,9 @@ keys_of_window () initial_define_key (control_x_map, '<', "scroll-left"); initial_define_key (control_x_map, '>', "scroll-right"); - initial_define_key (global_map, Ctl ('V'), "scroll-up"); + initial_define_key (global_map, Ctl ('V'), "scroll-up-command"); initial_define_key (meta_map, Ctl ('V'), "scroll-other-window"); - initial_define_key (meta_map, 'v', "scroll-down"); + initial_define_key (meta_map, 'v', "scroll-down-command"); } /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f |