# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1271205212 -10800
# Node ID de5ba6f3514c2d319061da6ae47378702037cf8c
# Parent  4abde609aac9761ad6005247cd3a28063102f001
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 -r 4abde609aac9 -r de5ba6f3514c lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Apr 14 03:11:21 2010 +0300
+++ b/lisp/ChangeLog	Wed Apr 14 03:33:32 2010 +0300
@@ -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 -r 4abde609aac9 -r de5ba6f3514c lisp/emulation/cua-rect.el
--- a/lisp/emulation/cua-rect.el	Wed Apr 14 03:11:21 2010 +0300
+++ b/lisp/emulation/cua-rect.el	Wed Apr 14 03:33:32 2010 +0300
@@ -1432,6 +1432,8 @@
   (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 -r 4abde609aac9 -r de5ba6f3514c lisp/forms.el
--- a/lisp/forms.el	Wed Apr 14 03:11:21 2010 +0300
+++ b/lisp/forms.el	Wed Apr 14 03:33:32 2010 +0300
@@ -1407,7 +1407,9 @@
   (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 -r 4abde609aac9 -r de5ba6f3514c lisp/image-mode.el
--- a/lisp/image-mode.el	Wed Apr 14 03:11:21 2010 +0300
+++ b/lisp/image-mode.el	Wed Apr 14 03:33:32 2010 +0300
@@ -302,6 +302,8 @@
     (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 -r 4abde609aac9 -r de5ba6f3514c lisp/tutorial.el
--- a/lisp/tutorial.el	Wed Apr 14 03:11:21 2010 +0300
+++ b/lisp/tutorial.el	Wed Apr 14 03:33:32 2010 +0300
@@ -218,8 +218,8 @@
              (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 -r 4abde609aac9 -r de5ba6f3514c src/ChangeLog
--- a/src/ChangeLog	Wed Apr 14 03:11:21 2010 +0300
+++ b/src/ChangeLog	Wed Apr 14 03:33:32 2010 +0300
@@ -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 -r 4abde609aac9 -r de5ba6f3514c src/window.c
--- a/src/window.c	Wed Apr 14 03:11:21 2010 +0300
+++ b/src/window.c	Wed Apr 14 03:33:32 2010 +0300
@@ -7391,9 +7391,9 @@
   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