[Emacs-diffs] /srv/bzr/emacs/trunk r99897: Bind `C-v' to `scroll-up-command' and `M-v' to `scroll-down-command'.

[Juri Linkov]

------------------------------------------------------------
revno: 99897
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-14 03:33:32 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/emulation/cua-rect.el
  lisp/forms.el
  lisp/image-mode.el
  lisp/tutorial.el
  src/ChangeLog
  src/window.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-14 00:11:21 +0000
+++ b/lisp/ChangeLog    2010-04-14 00:33:32 +0000
@@ -1,5 +1,16 @@
 2010-04-14  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * mwheel.el (scroll-preserve-screen-position-commands):
        Add mwheel-scroll to this list of commands.
 

=== modified file 'lisp/emulation/cua-rect.el'
--- a/lisp/emulation/cua-rect.el        2010-01-13 08:35:10 +0000
+++ b/lisp/emulation/cua-rect.el        2010-04-14 00:33:32 +0000
@@ -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)

=== modified file 'lisp/forms.el'
--- a/lisp/forms.el     2010-01-13 08:35:10 +0000
+++ b/lisp/forms.el     2010-04-14 00:33:32 +0000
@@ -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

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2010-03-10 05:18:51 +0000
+++ b/lisp/image-mode.el        2010-04-14 00:33:32 +0000
@@ -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)

=== modified file 'lisp/tutorial.el'
--- a/lisp/tutorial.el  2010-01-13 08:35:10 +0000
+++ b/lisp/tutorial.el  2010-04-14 00:33:32 +0000
@@ -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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-14 00:11:21 +0000
+++ b/src/ChangeLog     2010-04-14 00:33:32 +0000
@@ -1,5 +1,11 @@
 2010-04-14  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * 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

=== modified file 'src/window.c'
--- a/src/window.c      2010-04-14 00:11:21 +0000
+++ b/src/window.c      2010-04-14 00:33:32 +0000
@@ -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