Bind `C-v' to `scroll-up-command' and `M-v' to `scroll-down-command'.

http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00403.html

* 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'.

* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8baac73bd9a80e06f809310460928155c152b46b..01bfbf55434c29eae8c35a5038238cc47723a048 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+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):

diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 4398b5aa1af4366f7a33ef2880601c0bcc74b26d..4ac8ce58b3e9a1d8f3133241940c5f3f5c4f49b2 100644 (file)
--- 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 acb86dcc194bde323f0b034aaafa40a47a045edf..50f7ac9f506ac48fb44a37a021b98074b7cee122 100644 (file)
--- 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 6169fa4cb715b8e6ed04f9d46ed717eed98a3aa7..cd292a8fa3b973cee96cbebf1ebac69c03c20541 100644 (file)
--- 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 de7f7ab4a3c6e74ed0743068d6a4ee18d686624a..0ac315ac6dc486f484434b47635f216af04db2ab 100644 (file)
--- 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 e4130a64838e2f47408980a15fb93b41a1202e85..82484b105be337e54c083249ef76239f6fa423a1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/src/window.c b/src/window.c
index 2757b98ddd9f640485e1c61ab9253b98fe8bb51a..b9683fbbca8635c8f2d9aa85e1d797f7ecb4ec05 100644 (file)
--- 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