aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTassilo Horn2013-12-20 17:03:12 +0100
committerTassilo Horn2013-12-20 17:03:12 +0100
commit30aafaf5163efc0eef0baae304ea19e194e20aa1 (patch)
tree55a73a57a3ce367fa328f7b683b187a6824ed286
parent7b4ec5497f42a3db1bbb0bfdba5560091587480f (diff)
downloademacs-30aafaf5163efc0eef0baae304ea19e194e20aa1.tar.gz
emacs-30aafaf5163efc0eef0baae304ea19e194e20aa1.zip
Document `S-SPC' as alternative to scrolling down with `DEL'.
* doc/emacs/rmail.texi: Document `S-SPC' as alternative to scrolling down with `DEL'. * doc/emacs/calendar.texi: Ditto. * doc/emacs/display.texi: Ditto. * doc/emacs/help.texi: Ditto. * doc/misc/info.texi: Document `S-SPC' as alternative to `DEL' for scrolling. * doc/misc/woman.texi: Ditto.
-rw-r--r--doc/emacs/ChangeLog9
-rw-r--r--doc/emacs/calendar.texi2
-rw-r--r--doc/emacs/display.texi4
-rw-r--r--doc/emacs/help.texi5
-rw-r--r--doc/emacs/rmail.texi4
-rw-r--r--doc/misc/ChangeLog7
-rw-r--r--doc/misc/info.texi33
-rw-r--r--doc/misc/woman.texi5
-rw-r--r--etc/NEWS1
9 files changed, 48 insertions, 22 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 47d3125f196..65b9e4836be 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,14 @@
12013-12-20 Tassilo Horn <tsdh@gnu.org> 12013-12-20 Tassilo Horn <tsdh@gnu.org>
2 2
3 * rmail.texi: Document `S-SPC' as alternative to scrolling down
4 with `DEL'.
5
6 * help.texi: Ditto.
7
8 * display.texi: Ditto.
9
10 * calendar.texi: Ditto.
11
3 * frames.texi: Document `toggle-frame-maximized' and 12 * frames.texi: Document `toggle-frame-maximized' and
4 `toggle-frame-fullscreen' with their respective keys. 13 `toggle-frame-fullscreen' with their respective keys.
5 14
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index c305be6f670..f5a0c720d1e 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -305,6 +305,8 @@ Regenerate the calendar window (@code{calendar-redraw}).
305Scroll the next window up (@code{scroll-other-window}). 305Scroll the next window up (@code{scroll-other-window}).
306@item DEL 306@item DEL
307Scroll the next window down (@code{scroll-other-window-down}). 307Scroll the next window down (@code{scroll-other-window-down}).
308@item S-SPC
309Scroll the next window down (@code{scroll-other-window-down}).
308@item q 310@item q
309Exit from calendar (@code{calendar-exit}). 311Exit from calendar (@code{calendar-exit}).
310@end table 312@end table
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 9eace49d91f..940e6d40d82 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -428,8 +428,8 @@ it. @xref{Disabling}.
428screenfuls. It provides commands for scrolling through the buffer 428screenfuls. It provides commands for scrolling through the buffer
429conveniently but not for changing it. Apart from the usual Emacs 429conveniently but not for changing it. Apart from the usual Emacs
430cursor motion commands, you can type @key{SPC} to scroll forward one 430cursor motion commands, you can type @key{SPC} to scroll forward one
431windowful, @key{DEL} to scroll backward, and @kbd{s} to start an 431windowful, @key{S-SPC} or @key{DEL} to scroll backward, and @kbd{s} to
432incremental search. 432start an incremental search.
433 433
434@kindex q @r{(View mode)} 434@kindex q @r{(View mode)}
435@kindex e @r{(View mode)} 435@kindex e @r{(View mode)}
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 2a31a96c004..42fa3438b69 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -377,8 +377,9 @@ alphabetical order, change the variable
377@section Help Mode Commands 377@section Help Mode Commands
378 378
379 Help buffers provide the same commands as View mode (@pxref{View 379 Help buffers provide the same commands as View mode (@pxref{View
380Mode}); for instance, @key{SPC} scrolls forward, and @key{DEL} scrolls 380Mode}); for instance, @key{SPC} scrolls forward, and @key{DEL} or
381backward. A few special commands are also provided: 381@kbd{S-SPC} scrolls backward. A few special commands are also
382provided:
382 383
383@table @kbd 384@table @kbd
384@item @key{RET} 385@item @key{RET}
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 67afc29a277..072af578332 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -112,8 +112,8 @@ Scroll to end of message (@code{rmail-end-of-message}).
112@kindex DEL @r{(Rmail)} 112@kindex DEL @r{(Rmail)}
113 Since the most common thing to do while reading a message is to 113 Since the most common thing to do while reading a message is to
114scroll through it by screenfuls, Rmail makes @key{SPC} and @key{DEL} 114scroll through it by screenfuls, Rmail makes @key{SPC} and @key{DEL}
115do the same as @kbd{C-v} (@code{scroll-up-command}) and @kbd{M-v} 115or @key{S-SPC} do the same as @kbd{C-v} (@code{scroll-up-command}) and
116(@code{scroll-down-command}) respectively. 116@kbd{M-v} (@code{scroll-down-command}) respectively.
117 117
118@kindex . @r{(Rmail)} 118@kindex . @r{(Rmail)}
119@kindex / @r{(Rmail)} 119@kindex / @r{(Rmail)}
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index fc07ad6dc08..47dd91aa051 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
12013-12-20 Tassilo Horn <tsdh@gnu.org>
2
3 * info.texi: Document `S-SPC' as alternative to `DEL' for
4 scrolling.
5
6 * woman.texi: Ditto.
7
12013-12-20 Jay Belanger <jay.p.belanger@gmail.com> 82013-12-20 Jay Belanger <jay.p.belanger@gmail.com>
2 9
3 * calc.texi (Stack Manipulation Commands): Mention using the variable 10 * calc.texi (Stack Manipulation Commands): Mention using the variable
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index d17a65571f1..32aee99868d 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -157,12 +157,12 @@ text @samp{Top} instead, it means that there is more text below that
157does not fit. To move forward through the text and see another screen 157does not fit. To move forward through the text and see another screen
158full, press @key{SPC}, the Space bar. To move back up, press the key 158full, press @key{SPC}, the Space bar. To move back up, press the key
159labeled @samp{Backspace} or @samp{DEL} (on some keyboards, this key 159labeled @samp{Backspace} or @samp{DEL} (on some keyboards, this key
160might be labeled @samp{Delete}). 160might be labeled @samp{Delete}), or @key{S-SPC}.
161 161
162@ifinfo 162@ifinfo
163Here are 40 lines of junk, so you can try @key{SPC} and @key{DEL} and 163Here are 40 lines of junk, so you can try @key{SPC} and @key{DEL} (or
164see what they do. At the end are instructions of what you should do 164@key{S-SPC}) and see what they do. At the end are instructions of
165next. 165what you should do next.
166 166
167@format 167@format
168This is line 20 168This is line 20
@@ -208,7 +208,7 @@ This is line 59
208@end format 208@end format
209 209
210If you have managed to get here, go back to the beginning with 210If you have managed to get here, go back to the beginning with
211@kbd{DEL} (or @key{BACKSPACE}), and come back here again, then you 211@kbd{DEL} (or @key{S-SPC}), and come back here again, then you
212understand the about the @samp{Space} and @samp{Backspace} keys. So 212understand the about the @samp{Space} and @samp{Backspace} keys. So
213now type an @kbd{n}---just one character; don't type the quotes and 213now type an @kbd{n}---just one character; don't type the quotes and
214don't type the Return key afterward---to get to the normal start of 214don't type the Return key afterward---to get to the normal start of
@@ -481,10 +481,10 @@ you to the following node in the manual @emph{regardless of level}.
481If you immediately want to go to that node, without having to scroll 481If you immediately want to go to that node, without having to scroll
482to the bottom of the screen first, you can type @kbd{]}. 482to the bottom of the screen first, you can type @kbd{]}.
483 483
484Similarly, @kbd{@key{BACKSPACE}} carries you to the preceding node 484Similarly, @kbd{@key{BACKSPACE}} (or @kbd{@key{S-SPC}}) carries you to
485regardless of level, after you scrolled to the beginning of the 485the preceding node regardless of level, after you scrolled to the
486present node. If you want to go to the preceding node immediately, 486beginning of the present node. If you want to go to the preceding
487you can type @kbd{[}. 487node immediately, you can type @kbd{[}.
488 488
489For instance, typing this sequence will come back here in three steps: 489For instance, typing this sequence will come back here in three steps:
490@kbd{[ n [}. To do the same backward, type @kbd{] p ]}. 490@kbd{[ n [}. To do the same backward, type @kbd{] p ]}.
@@ -1204,13 +1204,14 @@ all text that could potentially be useful.
1204 1204
1205@item Info-scroll-prefer-subnodes 1205@item Info-scroll-prefer-subnodes
1206If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or 1206If set to a non-@code{nil} value, @key{SPC} and @key{BACKSPACE} (or
1207@key{DEL}) keys in a menu visit subnodes of the current node before 1207@key{DEL}, or @key{S-SPC}) keys in a menu visit subnodes of the
1208scrolling to its end or beginning, respectively. For example, if the 1208current node before scrolling to its end or beginning, respectively.
1209node's menu appears on the screen, the next @key{SPC} moves to a 1209For example, if the node's menu appears on the screen, the next
1210subnode indicated by the following menu item. Setting this option to 1210@key{SPC} moves to a subnode indicated by the following menu item.
1211@code{nil} results in behavior similar to the stand-alone Info reader 1211Setting this option to @code{nil} results in behavior similar to the
1212program, which visits the first subnode from the menu only when you 1212stand-alone Info reader program, which visits the first subnode from
1213hit the end of the current node. The default is @code{nil}. 1213the menu only when you hit the end of the current node. The default
1214is @code{nil}.
1214 1215
1215@item Info-isearch-search 1216@item Info-isearch-search
1216If non-@code{nil}, isearch in Info searches through multiple nodes. 1217If non-@code{nil}, isearch in Info searches through multiple nodes.
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 8005d58ce8a..0502ab5c220 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -633,6 +633,11 @@ Scroll the man page up the window (@code{scroll-up}).
633@findex scroll-down 633@findex scroll-down
634Scroll the man page down the window (@code{scroll-down}). 634Scroll the man page down the window (@code{scroll-down}).
635 635
636@item @key{S-SPC}
637@kindex S-SPC
638@findex scroll-down
639Scroll the man page down the window (@code{scroll-down}).
640
636@item n 641@item n
637@kindex n 642@kindex n
638@findex Man-next-section 643@findex Man-next-section
diff --git a/etc/NEWS b/etc/NEWS
index de0478eadfc..64db9009866 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -248,6 +248,7 @@ was mistakenly retained.
248** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized', 248** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized',
249bound to <f11> and M-<f10>, respectively. 249bound to <f11> and M-<f10>, respectively.
250 250
251+++
251** In keymaps where SPC scrolls, S-SPC now scrolls in the reverse direction. 252** In keymaps where SPC scrolls, S-SPC now scrolls in the reverse direction.
252Eg View mode, etc. 253Eg View mode, etc.
253 254