From: Glenn Morris Date: Tue, 12 Feb 2013 04:46:18 +0000 (-0800) Subject: Make S-SPC scroll in the opposite direction to SPC X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/958614cf809c0d4dedb703245da5bddc360743af Make S-SPC scroll in the opposite direction to SPC * lisp/calc/calc-graph.el (calc-graph-show-dumb): * lisp/calendar/calendar.el (calendar-mode-map): * lisp/cus-edit.el (custom-mode-map): * lisp/ehelp.el (electric-help-map): * lisp/emulation/vip.el (vip-mode-map): * lisp/epa.el (epa-key-list-mode-map): * lisp/info.el (Info-mode-map): * lisp/mail/rmail.el (rmail-mode-map): * lisp/mail/rmailsum.el (rmail-summary-mode-map): * lisp/man.el (Man-mode-map): * lisp/net/newst-plainview.el (newsticker-mode-map): * lisp/progmodes/cpp.el (cpp-edit-mode-map): * lisp/progmodes/grep.el (grep-mode-map): * lisp/progmodes/idlw-help.el (idlwave-help-mode-map): * lisp/simple.el (special-mode-map): * lisp/startup.el (splash-screen-keymap): * lisp/view.el (view-mode-map): Make S-SPC scroll in the opposite sense to SPC. Fixes: debbugs:2145 --- diff --git a/etc/NEWS b/etc/NEWS index a29c8eb054..bbee14d2ac 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -76,6 +76,9 @@ of the buffer is visible). ** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized', bound to and M-, respectively. +** In keymaps where SPC scrolls, S-SPC now scrolls in the reverse direction. +Eg View mode, etc. + * Changes in Specialized Modes and Packages in Emacs 24.4 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fd2186fcfb..924f8cbaf3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2013-02-12 Glenn Morris + + * calc/calc-graph.el (calc-graph-show-dumb): + * calendar/calendar.el (calendar-mode-map): + * cus-edit.el (custom-mode-map): + * ehelp.el (electric-help-map): + * emulation/vip.el (vip-mode-map): + * epa.el (epa-key-list-mode-map): + * info.el (Info-mode-map): + * mail/rmail.el (rmail-mode-map): + * mail/rmailsum.el (rmail-summary-mode-map): + * man.el (Man-mode-map): + * net/newst-plainview.el (newsticker-mode-map): + * progmodes/cpp.el (cpp-edit-mode-map): + * progmodes/grep.el (grep-mode-map): + * progmodes/idlw-help.el (idlwave-help-mode-map): + * simple.el (special-mode-map): + * startup.el (splash-screen-keymap): + * view.el (view-mode-map): + Make S-SPC scroll in the opposite sense to SPC. (Bug#2145) + 2013-02-11 Elias Pipping * doc-view.el (doc-view-current-cache-dir): Beware % escapes diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index 4376e21b4c..c84c7fdf94 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -948,6 +948,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (setq calc-dumb-map (make-sparse-keymap)) (define-key calc-dumb-map "\n" 'scroll-up-command) (define-key calc-dumb-map " " 'scroll-up-command) + (define-key calc-dump-map [?\S-\ ] 'scroll-down-command) (define-key calc-dumb-map "\177" 'scroll-down-command) (define-key calc-dumb-map "<" 'scroll-left) (define-key calc-dumb-map ">" 'scroll-right) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 74d3ce8033..20a8684e38 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1635,6 +1635,7 @@ line." (define-key map "S" 'calendar-sunrise-sunset) (define-key map "M" 'calendar-lunar-phases) (define-key map " " 'scroll-other-window) + (define-key map [?\S-\ ] 'scroll-other-window-down) (define-key map "\d" 'scroll-other-window-down) (define-key map "\C-c\C-l" 'calendar-redraw) (define-key map "." 'calendar-goto-today) diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 6d1ebe5a96..d19e2ded00 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -443,6 +443,7 @@ (define-key map [remap self-insert-command] 'Custom-no-edit) (define-key map "\^m" 'Custom-newline) (define-key map " " 'scroll-up-command) + (define-key map [?\S-\ ] 'scroll-down-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) diff --git a/lisp/ehelp.el b/lisp/ehelp.el index 416666f918..88fc87b5b7 100644 --- a/lisp/ehelp.el +++ b/lisp/ehelp.el @@ -80,6 +80,7 @@ (define-key map (char-to-string help-char) 'electric-help-help) (define-key map "?" 'electric-help-help) (define-key map " " 'scroll-up) + (define-key map [?\S-\ ] 'scroll-down) (define-key map "\^?" 'scroll-down) (define-key map "." 'beginning-of-buffer) (define-key map "<" 'beginning-of-buffer) diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index 4e6749d9cf..e086f26e8a 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -183,6 +183,7 @@ If nil then it is bound to `delete-backward-char'." (define-key map "\C-z" 'vip-change-mode-to-emacs) (define-key map "\e" 'vip-ESC) + (define-key map [?\S-\ ] 'vip-scroll-back) (define-key map " " 'vip-scroll) (define-key map "!" 'vip-command-argument) (define-key map "\"" 'vip-command-argument) diff --git a/lisp/epa.el b/lisp/epa.el index 61a1378aa2..852d10b1cf 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -169,6 +169,7 @@ You should bind this variable with `let', but do not set it globally.") (define-key keymap "n" 'next-line) (define-key keymap "p" 'previous-line) (define-key keymap " " 'scroll-up-command) + (define-key keymap [?\S-\ ] 'scroll-down-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)) diff --git a/lisp/info.el b/lisp/info.el index c276420fb7..a6db9f3f4d 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -3874,6 +3874,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'." (suppress-keymap map) (define-key map "." 'beginning-of-buffer) (define-key map " " 'Info-scroll-up) + (define-key map [?\S-\ ] 'Info-scroll-down) (define-key map "\C-m" 'Info-follow-nearest-node) (define-key map "\t" 'Info-next-reference) (define-key map "\e\t" 'Info-prev-reference) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 96d341c30d..02703026e8 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1085,6 +1085,7 @@ The buffer is expected to be narrowed to just the header of the message." (define-key map "<" 'rmail-first-message) (define-key map ">" 'rmail-last-message) (define-key map " " 'scroll-up-command) + (define-key map [?\S-\ ] 'scroll-down-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) @@ -4751,7 +4752,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels -;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "341825201e892b8fc875c1ae49ffd560") +;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "119ce8b431f01e7f54bb6fa99603b3d9") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 5b906719c3..13cd7c3f05 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -118,6 +118,7 @@ Setting this option to nil might speed up the generation of summaries." (define-key map "<" 'rmail-summary-first-message) (define-key map ">" 'rmail-summary-last-message) (define-key map " " 'rmail-summary-scroll-msg-up) + (define-key map [?\S-\ ] 'rmail-summary-scroll-msg-down) (define-key map "\177" 'rmail-summary-scroll-msg-down) (define-key map "?" 'describe-mode) (define-key map "\C-c\C-n" 'rmail-summary-next-same-subject) diff --git a/lisp/man.el b/lisp/man.el index 93a67128de..04abc3d4d8 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -426,6 +426,7 @@ Otherwise, the value is whatever the function (suppress-keymap map) (set-keymap-parent map button-buffer-map) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map " " 'scroll-up-command) (define-key map "\177" 'scroll-down-command) (define-key map "n" 'Man-next-section) diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index 2eb04787be..c7a3a10707 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -5,7 +5,7 @@ ;; Author: Ulf Jasper ;; Filename: newst-plainview.el ;; URL: http://www.nongnu.org/newsticker -;; Time-stamp: "13. Mai 2011, 19:28:34 (ulf)" +;; Time-stamp: "Mon 11-Feb-2013 20:27:11 gm on skiddaw" ;; Package: newsticker ;; ====================================================================== @@ -405,6 +405,7 @@ images." (define-key map "sx" 'newsticker-show-extra) (define-key map "hx" 'newsticker-hide-extra) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map " " 'scroll-up-command) (define-key map "q" 'newsticker-close-buffer) (define-key map "p" 'newsticker-previous-item) diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 340b97e80b..674d98b8dc 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -420,6 +420,7 @@ A prefix arg suppresses display of that buffer." (define-key map [ down-mouse-2 ] 'cpp-push-button) (define-key map [ mouse-2 ] 'ignore) (define-key map " " 'scroll-up-command) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map "\C-?" 'scroll-down-command) (define-key map [ delete ] 'scroll-down) (define-key map "\C-c\C-c" 'cpp-edit-apply) diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index d8c39f2dde..1e152c6d75 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -246,6 +246,7 @@ See `compilation-error-screen-columns'" (let ((map (make-sparse-keymap))) (set-keymap-parent map compilation-minor-mode-map) (define-key map " " 'scroll-up-command) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map "\^?" 'scroll-down-command) (define-key map "\C-c\C-f" 'next-error-follow-minor-mode) diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 0e44e5366c..749b0b6557 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -227,6 +227,7 @@ support." (interactive "p") (scroll-up arg))) (define-key map " " 'scroll-up-command) + (define-key map [?\S-\ ] 'scroll-down-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) diff --git a/lisp/simple.el b/lisp/simple.el index 9587d3c006..849f7dac55 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -358,6 +358,7 @@ Other major modes are defined by comparison with this one." (suppress-keymap map) (define-key map "q" 'quit-window) (define-key map " " 'scroll-up-command) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map "\C-?" 'scroll-down-command) (define-key map "?" 'describe-mode) (define-key map "h" 'describe-mode) diff --git a/lisp/startup.el b/lisp/startup.el index 741c5aa9b4..ad31a7a2a4 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1466,6 +1466,7 @@ Each element in the list should be a list of strings or pairs (suppress-keymap map) (set-keymap-parent map button-buffer-map) (define-key map "\C-?" 'scroll-down-command) + (define-key map [?\S-\ ] 'scroll-down-command) (define-key map " " 'scroll-up-command) (define-key map "q" 'exit-splash-screen) map) diff --git a/lisp/view.el b/lisp/view.el index 2717c915c7..f9326399a2 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -199,6 +199,7 @@ This is local in each buffer, once it is used.") (define-key map "\C-?" 'View-scroll-page-backward) ;; (define-key map "f" 'View-scroll-page-forward) (define-key map " " 'View-scroll-page-forward) + (define-key map [?\S-\ ] 'View-scroll-page-backward) (define-key map "o" 'View-scroll-to-buffer-end) (define-key map ">" 'end-of-buffer) (define-key map "<" 'beginning-of-buffer) @@ -407,8 +408,8 @@ Digits provide prefix arguments. \\[View-scroll-to-buffer-end] scroll so that buffer end is at last line of window. SPC scroll forward \"page size\" lines. With prefix scroll forward prefix lines. -DEL scroll backward \"page size\" lines. - With prefix scroll backward prefix lines. +DEL, S-SPC scroll backward \"page size\" lines. + With prefix scroll backward prefix lines. \\[View-scroll-page-forward-set-page-size] like \\[View-scroll-page-forward] but with prefix sets \"page size\" to prefix. \\[View-scroll-page-backward-set-page-size] like \\[View-scroll-page-backward] but with prefix sets \"page size\" to prefix. \\[View-scroll-half-page-forward] scroll forward \"half page size\" lines. With prefix, sets