Fix event race

[bpt/emacs.git] / doc / emacs / rmail.texi

diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 67afc29..2f823a7 100644 (file)
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2014 Free Software
 @c Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Rmail
@@ -101,6 +101,7 @@ frequent that it deserves to be easier.
 @item @key{SPC}
 Scroll forward (@code{scroll-up-command}).
 @item @key{DEL}
+@itemx @key{S-SPC}
 Scroll backward (@code{scroll-down-command}).
 @item .
 Scroll to start of message (@code{rmail-beginning-of-message}).
@@ -110,10 +111,11 @@ Scroll to end of message (@code{rmail-end-of-message}).
 
 @kindex SPC @r{(Rmail)}
 @kindex DEL @r{(Rmail)}
+@kindex S-SPC @r{(Rmail)}
   Since the most common thing to do while reading a message is to
 scroll through it by screenfuls, Rmail makes @key{SPC} and @key{DEL}
-do the same as @kbd{C-v} (@code{scroll-up-command}) and @kbd{M-v}
-(@code{scroll-down-command}) respectively.
+(or @key{S-SPC}) do the same as @kbd{C-v} (@code{scroll-up-command})
+and @kbd{M-v} (@code{scroll-down-command}) respectively.
 
 @kindex . @r{(Rmail)}
 @kindex / @r{(Rmail)}
@@ -367,12 +369,20 @@ the rest of Rmail, since only Rmail operates on the Rmail file.
 @end enumerate
 
 @c FIXME remove this in Emacs 25; won't be relevant any more.
+@cindex Babyl files
+@cindex mbox files
   Rmail was originally written to use the Babyl format as its internal
 format.  Since then, we have recognized that the usual inbox format
 (@samp{mbox}) on Unix and GNU systems is adequate for the job, and so
 since Emacs 23 Rmail uses that as its internal format.  The Rmail file
 is still separate from the inbox file, even though their format is the
 same.
+@c But this bit should stay in some form.
+@vindex rmail-mbox-format
+(In fact, there are a few slightly different mbox formats.
+The differences are not very important, but you can set the variable
+@code{rmail-mbox-format} to tell Rmail which form your system uses.
+See that variable's documentation for more details.)
 
 @vindex rmail-preserve-inbox
   When getting new mail, Rmail first copies the new mail from the