diff options
| -rw-r--r-- | lisp/ChangeLog | 20 | ||||
| -rw-r--r-- | lisp/calc/calc-graph.el | 10 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 4 | ||||
| -rw-r--r-- | lisp/ebuff-menu.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/vi.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/ws-mode.el | 6 | ||||
| -rw-r--r-- | lisp/epa.el | 4 | ||||
| -rw-r--r-- | lisp/mail/rmail.el | 4 | ||||
| -rw-r--r-- | lisp/man.el | 4 | ||||
| -rw-r--r-- | lisp/net/newst-plainview.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cpp.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/ebrowse.el | 8 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/idlw-help.el | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 4 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 4 | ||||
| -rw-r--r-- | lisp/term/sun.el | 4 |
18 files changed, 58 insertions, 38 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c17ee5b12d..3b177ac07b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,25 @@ 2011-10-01 Chong Yidong <[email protected]> + * 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. diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index d5d8f0aaf3..4fd5045f54 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -946,13 +946,13 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (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) diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 9ba8b27c69..07944a6c16 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -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) diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el index a906cf8516..8ab974be57 100644 --- a/lisp/ebuff-menu.el +++ b/lisp/ebuff-menu.el @@ -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) diff --git a/lisp/emulation/vi.el b/lisp/emulation/vi.el index 5bab974164..9bf108c8c3 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 69f7b1d50e..3a205c7c4f 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) diff --git a/lisp/epa.el b/lisp/epa.el index 5164181454..229138bd45 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -214,8 +214,8 @@ You should bind this variable with `let', but do not set it globally.") (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] diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 54de6310b5..770050efb0 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1035,8 +1035,8 @@ The buffer is expected to be narrowed to just the header of the message." (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) diff --git a/lisp/man.el b/lisp/man.el index ed24e35f0e..14fdac4e5d 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -398,8 +398,8 @@ Otherwise, the value is whatever the function (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) diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index d1b042cad6..906044079c 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -427,7 +427,7 @@ images." (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) diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index a8f01705e2..e5bfda5472 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -419,8 +419,8 @@ A prefix arg suppresses display of that buffer." (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) diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index d31a46cc30..dd7a9824af 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -1980,8 +1980,8 @@ COLLAPSE non-nil means collapse the branch." (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 @@ Prefix arg ARG says how much." (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) diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 2c68a29dd0..ff192d5678 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -245,8 +245,8 @@ See `compilation-error-screen-columns'" (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) ;; ? diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 05fcedde04..8d8966ee15 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -226,8 +226,8 @@ support." (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) diff --git a/lisp/simple.el b/lisp/simple.el index 1ab90792bf..c81385680b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -357,8 +357,8 @@ Other major modes are defined by comparison with this one." (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) diff --git a/lisp/startup.el b/lisp/startup.el index 16cf41506b..842548577c 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1450,8 +1450,8 @@ Each element in the list should be a list of strings or pairs (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.") diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 447d7fd253..646b65abc6 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -150,8 +150,8 @@ The properties returned may include `top', `left', `height', and `width'." (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) diff --git a/lisp/term/sun.el b/lisp/term/sun.el index d375656569..ab7ca8bf5a 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el @@ -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) |