emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r105976: Change scroll-up/down bindin


From: Chong Yidong
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r105976: Change scroll-up/down bindings to Emacs 24's scroll-*-command.
Date: Sat, 01 Oct 2011 16:32:01 -0400
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 105976
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-01 16:32:01 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/calc/calc-graph.el
  lisp/cus-edit.el
  lisp/ebuff-menu.el
  lisp/emulation/vi.el
  lisp/emulation/ws-mode.el
  lisp/epa.el
  lisp/mail/rmail.el
  lisp/man.el
  lisp/net/newst-plainview.el
  lisp/progmodes/cpp.el
  lisp/progmodes/ebrowse.el
  lisp/progmodes/grep.el
  lisp/progmodes/idlw-help.el
  lisp/simple.el
  lisp/startup.el
  lisp/term/ns-win.el
  lisp/term/sun.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-01 18:27:21 +0000
+++ b/lisp/ChangeLog    2011-10-01 20:32:01 +0000
@@ -1,5 +1,25 @@
 2011-10-01  Chong Yidong  <address@hidden>
 
+       * 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.
+
        * custom.el (custom-safe-themes, load-theme): Treat value of t for
        custom-safe-themes as special.
 

=== modified file 'lisp/calc/calc-graph.el'
--- a/lisp/calc/calc-graph.el   2011-01-25 04:08:28 +0000
+++ b/lisp/calc/calc-graph.el   2011-10-01 20:32:01 +0000
@@ -946,13 +946,13 @@
     (or calc-dumb-map
        (progn
          (setq calc-dumb-map (make-sparse-keymap))
-         (define-key calc-dumb-map "\n" 'scroll-up)
-         (define-key calc-dumb-map " " 'scroll-up)
-         (define-key calc-dumb-map "\177" 'scroll-down)
+         (define-key calc-dumb-map "\n" 'scroll-up-command)
+         (define-key calc-dumb-map " " 'scroll-up-command)
+         (define-key calc-dumb-map "\177" 'scroll-down-command)
          (define-key calc-dumb-map "<" 'scroll-left)
          (define-key calc-dumb-map ">" 'scroll-right)
-         (define-key calc-dumb-map "{" 'scroll-down)
-         (define-key calc-dumb-map "}" 'scroll-up)
+         (define-key calc-dumb-map "{" 'scroll-down-command)
+         (define-key calc-dumb-map "}" 'scroll-up-command)
          (define-key calc-dumb-map "q" 'exit-recursive-edit)
          (define-key calc-dumb-map "\C-c\C-c" 'exit-recursive-edit)))
     (use-local-map calc-dumb-map)

=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el  2011-09-22 16:15:52 +0000
+++ b/lisp/cus-edit.el  2011-10-01 20:32:01 +0000
@@ -442,8 +442,8 @@
     (set-keymap-parent map widget-keymap)
     (define-key map [remap self-insert-command] 'Custom-no-edit)
     (define-key map "\^m" 'Custom-newline)
-    (define-key map " " 'scroll-up)
-    (define-key map "\177" 'scroll-down)
+    (define-key map " " 'scroll-up-command)
+    (define-key map "\177" 'scroll-down-command)
     (define-key map "\C-c\C-c" 'Custom-set)
     (define-key map "\C-x\C-s" 'Custom-save)
     (define-key map "q" 'Custom-buffer-done)

=== modified file 'lisp/ebuff-menu.el'
--- a/lisp/ebuff-menu.el        2011-03-12 19:19:47 +0000
+++ b/lisp/ebuff-menu.el        2011-10-01 20:32:01 +0000
@@ -70,8 +70,8 @@
     (define-key map "\C-n" 'next-line)
     (define-key map "p" 'previous-line)
     (define-key map "n" 'next-line)
-    (define-key map "\C-v" 'scroll-up)
-    (define-key map "\ev" 'scroll-down)
+    (define-key map "\C-v" 'scroll-up-command)
+    (define-key map "\ev" 'scroll-down-command)
     (define-key map ">" 'scroll-right)
     (define-key map "<" 'scroll-left)
     (define-key map "\e\C-v" 'scroll-other-window)

=== modified file 'lisp/emulation/vi.el'
--- a/lisp/emulation/vi.el      2011-01-15 23:16:57 +0000
+++ b/lisp/emulation/vi.el      2011-10-01 20:32:01 +0000
@@ -142,7 +142,7 @@
   (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)

=== modified file 'lisp/emulation/ws-mode.el'
--- a/lisp/emulation/ws-mode.el 2011-01-25 04:08:28 +0000
+++ b/lisp/emulation/ws-mode.el 2011-10-01 20:32:01 +0000
@@ -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)

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2011-09-18 20:43:20 +0000
+++ b/lisp/epa.el       2011-10-01 20:32:01 +0000
@@ -214,8 +214,8 @@
     (define-key keymap "g" 'revert-buffer)
     (define-key keymap "n" 'next-line)
     (define-key keymap "p" 'previous-line)
-    (define-key keymap " " 'scroll-up)
-    (define-key keymap [delete] 'scroll-down)
+    (define-key keymap " " 'scroll-up-command)
+    (define-key keymap [delete] 'scroll-down-command)
     (define-key keymap "q" 'epa-exit-buffer)
     (define-key keymap [menu-bar epa-key-list-mode] (cons "Keys" menu-map))
     (define-key menu-map [epa-key-list-unmark-key]

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2011-09-23 23:44:32 +0000
+++ b/lisp/mail/rmail.el        2011-10-01 20:32:01 +0000
@@ -1035,8 +1035,8 @@
     (define-key map "/"      'rmail-end-of-message)
     (define-key map "<"      'rmail-first-message)
     (define-key map ">"      'rmail-last-message)
-    (define-key map " "      'scroll-up)
-    (define-key map "\177"   'scroll-down)
+    (define-key map " "      'scroll-up-command)
+    (define-key map "\177"   'scroll-down-command)
     (define-key map "?"      'describe-mode)
     (define-key map "\C-c\C-s\C-d" 'rmail-sort-by-date)
     (define-key map "\C-c\C-s\C-s" 'rmail-sort-by-subject)

=== modified file 'lisp/man.el'
--- a/lisp/man.el       2011-07-14 17:43:29 +0000
+++ b/lisp/man.el       2011-10-01 20:32:01 +0000
@@ -398,8 +398,8 @@
     (suppress-keymap map)
     (set-keymap-parent map button-buffer-map)
 
-    (define-key map " "    'scroll-up)
-    (define-key map "\177" 'scroll-down)
+    (define-key map " "    'scroll-up-command)
+    (define-key map "\177" 'scroll-down-command)
     (define-key map "n"    'Man-next-section)
     (define-key map "p"    'Man-previous-section)
     (define-key map "\en"  'Man-next-manpage)

=== modified file 'lisp/net/newst-plainview.el'
--- a/lisp/net/newst-plainview.el       2011-05-13 19:06:36 +0000
+++ b/lisp/net/newst-plainview.el       2011-10-01 20:32:01 +0000
@@ -427,7 +427,7 @@
     (define-key map "sx" 'newsticker-show-extra)
     (define-key map "hx" 'newsticker-hide-extra)
 
-    (define-key map " "  'scroll-up)
+    (define-key map " "  'scroll-up-command)
     (define-key map "q"  'newsticker-close-buffer)
     (define-key map "p"  'newsticker-previous-item)
     (define-key map "P"  'newsticker-previous-new-item)

=== modified file 'lisp/progmodes/cpp.el'
--- a/lisp/progmodes/cpp.el     2011-04-22 18:44:26 +0000
+++ b/lisp/progmodes/cpp.el     2011-10-01 20:32:01 +0000
@@ -419,8 +419,8 @@
     (suppress-keymap map)
     (define-key map [ down-mouse-2 ] 'cpp-push-button)
     (define-key map [ mouse-2 ] 'ignore)
-    (define-key map " " 'scroll-up)
-    (define-key map "\C-?" 'scroll-down)
+    (define-key map " " 'scroll-up-command)
+    (define-key map "\C-?" 'scroll-down-command)
     (define-key map [ delete ] 'scroll-down)
     (define-key map "\C-c\C-c" 'cpp-edit-apply)
     (define-key map "a" 'cpp-edit-apply)

=== modified file 'lisp/progmodes/ebrowse.el'
--- a/lisp/progmodes/ebrowse.el 2011-04-22 18:44:26 +0000
+++ b/lisp/progmodes/ebrowse.el 2011-10-01 20:32:01 +0000
@@ -1980,8 +1980,8 @@
     (define-key map "p" 'previous-line)
     (define-key map "n" 'next-line)
     (define-key map "v" 'ebrowse-electric-view-buffer)
-    (define-key map "\C-v" 'scroll-up)
-    (define-key map "\ev" 'scroll-down)
+    (define-key map "\C-v" 'scroll-up-command)
+    (define-key map "\ev" 'scroll-down-command)
     (define-key map "\e\C-v" 'scroll-other-window)
     (define-key map "\e>" 'end-of-buffer)
     (define-key map "\e<" 'beginning-of-buffer)
@@ -3929,8 +3929,8 @@
     (define-key map "p" 'previous-line)
     (define-key map "n" 'next-line)
     (define-key map "v" 'ebrowse-electric-view-position)
-    (define-key map "\C-v" 'scroll-up)
-    (define-key map "\ev" 'scroll-down)
+    (define-key map "\C-v" 'scroll-up-command)
+    (define-key map "\ev" 'scroll-down-command)
     (define-key map "\e\C-v" 'scroll-other-window)
     (define-key map "\e>" 'end-of-buffer)
     (define-key map "\e<" 'beginning-of-buffer)

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2011-09-18 20:20:08 +0000
+++ b/lisp/progmodes/grep.el    2011-10-01 20:32:01 +0000
@@ -245,8 +245,8 @@
 (defvar grep-mode-map
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map compilation-minor-mode-map)
-    (define-key map " " 'scroll-up)
-    (define-key map "\^?" 'scroll-down)
+    (define-key map " " 'scroll-up-command)
+    (define-key map "\^?" 'scroll-down-command)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
 
     (define-key map "\r" 'compile-goto-error)  ;; ?

=== modified file 'lisp/progmodes/idlw-help.el'
--- a/lisp/progmodes/idlw-help.el       2011-05-23 17:57:17 +0000
+++ b/lisp/progmodes/idlw-help.el       2011-10-01 20:32:01 +0000
@@ -226,8 +226,8 @@
     (define-key map "\C-m" (lambda (arg)
                              (interactive "p")
                              (scroll-up arg)))
-    (define-key map " " 'scroll-up)
-    (define-key map [delete] 'scroll-down)
+    (define-key map " " 'scroll-up-command)
+    (define-key map [delete] 'scroll-down-command)
     (define-key map "h" 'idlwave-help-find-header)
     (define-key map "H" 'idlwave-help-find-first-header)
     (define-key map "." 'idlwave-help-toggle-header-match-and-def)

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2011-09-29 13:03:42 +0000
+++ b/lisp/simple.el    2011-10-01 20:32:01 +0000
@@ -357,8 +357,8 @@
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
     (define-key map "q" 'quit-window)
-    (define-key map " " 'scroll-up)
-    (define-key map "\C-?" 'scroll-down)
+    (define-key map " " 'scroll-up-command)
+    (define-key map "\C-?" 'scroll-down-command)
     (define-key map "?" 'describe-mode)
     (define-key map "h" 'describe-mode)
     (define-key map ">" 'end-of-buffer)

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2011-09-30 13:21:29 +0000
+++ b/lisp/startup.el   2011-10-01 20:32:01 +0000
@@ -1450,8 +1450,8 @@
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
     (set-keymap-parent map button-buffer-map)
-    (define-key map "\C-?" 'scroll-down)
-    (define-key map " " 'scroll-up)
+    (define-key map "\C-?" 'scroll-down-command)
+    (define-key map " " 'scroll-up-command)
     (define-key map "q" 'exit-splash-screen)
     map)
   "Keymap for splash screen buffer.")

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2011-06-30 02:54:16 +0000
+++ b/lisp/term/ns-win.el       2011-10-01 20:32:01 +0000
@@ -150,8 +150,8 @@
 (define-key global-map [end] 'end-of-buffer)
 (define-key global-map [kp-home] 'beginning-of-buffer)
 (define-key global-map [kp-end] 'end-of-buffer)
-(define-key global-map [kp-prior] 'scroll-down)
-(define-key global-map [kp-next] 'scroll-up)
+(define-key global-map [kp-prior] 'scroll-down-command)
+(define-key global-map [kp-next] 'scroll-up-command)
 
 ;; Allow shift-clicks to work similarly to under Nextstep.
 (define-key global-map [S-mouse-1] 'mouse-save-then-kill)

=== modified file 'lisp/term/sun.el'
--- a/lisp/term/sun.el  2011-01-25 04:08:28 +0000
+++ b/lisp/term/sun.el  2011-10-01 20:32:01 +0000
@@ -133,10 +133,10 @@
   (global-set-key [r3] 'backward-page)
   (global-set-key [r6] 'forward-page)
   (global-set-key [r7] 'beginning-of-buffer)
-  (global-set-key [r9] 'scroll-down)
+  (global-set-key [r9] 'scroll-down-command)
   (global-set-key [r11]        'recenter)
   (global-set-key [r13]        'end-of-buffer)
-  (global-set-key [r15]        'scroll-up)
+  (global-set-key [r15]        'scroll-up-command)
   (global-set-key [redo]       'redraw-display) ;FIXME: collides with default.
   (global-set-key [props]      'list-buffers)
   (global-set-key [put]        'sun-select-region)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]