Change scroll-up/down bindings to Emacs 24's scroll-*-command.

* cus-edit.el (custom-mode-map):
* epa.el (epa-key-list-mode-map):
* man.el (Man-mode-map):
* startup.el (splash-screen-keymap):
* simple.el (special-mode-map): Use scroll-up-command and
scroll-down-command.

* progmodes/idlw-help.el (idlwave-help-mode-map):
* progmodes/ebrowse.el (ebrowse-electric-position-mode-map):
* net/newst-plainview.el (newsticker-mode-map):
* emulation/ws-mode.el (wordstar-mode-map):
* emulation/vi.el (vi-com-map):
* calc/calc-graph.el (calc-graph-show-dumb):
* term/sun.el (terminal-init-sun):
* term/ns-win.el (global-map):
* progmodes/grep.el (grep-mode-map):
* progmodes/ebrowse.el (ebrowse-electric-list-mode-map):
* mail/rmail.el (rmail-mode-map):
* progmodes/cpp.el (cpp-edit-mode-map): Likewise.

2 files changed, 4 insertions, 4 deletions

diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el
index 5bab9741649..9bf108c8c38 100644
--- a/lisp/emulation/vi.el
+++ b/lisp/emulation/vi.el
@@ -142,7 +142,7 @@ command extensions.")
   (define-key vi-com-map "\C-s" 'vi-isearch-forward)  ; extension
   (define-key vi-com-map "\C-t" 'vi-transpose-objects) ; extension
   (define-key vi-com-map "\C-u" 'vi-scroll-up-window)
-  (define-key vi-com-map "\C-v" 'scroll-up) ; extension
+  (define-key vi-com-map "\C-v" 'scroll-up-command) ; extension
   (define-key vi-com-map "\C-w" 'vi-kill-region)   ; extension
   (define-key vi-com-map "\C-x" 'Control-X-prefix) ; extension
   (define-key vi-com-map "\C-y" 'vi-expose-line-above)
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index 69f7b1d50ea..3a205c7c4f0 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -143,11 +143,11 @@
     map)
   "")
 
-(defvar wordstar-mode-map 
+(defvar wordstar-mode-map
   (let ((map (make-keymap)))
     (define-key map "\C-a" 'backward-word)
     (define-key map "\C-b" 'fill-paragraph)
-    (define-key map "\C-c" 'scroll-up)
+    (define-key map "\C-c" 'scroll-up-command)
     (define-key map "\C-d" 'forward-char)
     (define-key map "\C-e" 'previous-line)
     (define-key map "\C-f" 'forward-word)
@@ -161,7 +161,7 @@
     (define-key map "\C-o" wordstar-C-o-map)
     (define-key map "\C-p" 'quoted-insert)
     (define-key map "\C-q" wordstar-C-q-map)
-    (define-key map "\C-r" 'scroll-down)
+    (define-key map "\C-r" 'scroll-down-command)
     (define-key map "\C-s" 'backward-char)
     (define-key map "\C-t" 'kill-word)
     (define-key map "\C-u" 'keyboard-quit)