[Emacs-diffs] Changes to emacs/man/rmail.texi

[Luc Teirlinck]

Index: emacs/man/rmail.texi
diff -c emacs/man/rmail.texi:1.25 emacs/man/rmail.texi:1.26
*** emacs/man/rmail.texi:1.25   Wed Mar 23 14:42:06 2005
--- emacs/man/rmail.texi        Sun Apr 10 19:25:14 2005
***************
*** 84,97 ****
  @findex rmail-quit
  @kindex b @r{(Rmail)}
  @findex rmail-bury
!   You can exit Rmail with @kbd{q} (@code{rmail-quit}); this expunges and
! saves the Rmail file and then switches to another buffer.  But there is
! no need to ``exit'' formally.  If you switch from Rmail to editing in
! other buffers, and never happen to switch back, you have exited.  (The
! Rmail command @kbd{b}, @code{rmail-bury}, does this for you.)  Just make
! sure to save the Rmail file eventually (like any other file you have
! changed).  @kbd{C-x s} is a good enough way to do this
! (@pxref{Saving}).
  
  @node Rmail Scrolling
  @section Scrolling Within a Message
--- 84,99 ----
  @findex rmail-quit
  @kindex b @r{(Rmail)}
  @findex rmail-bury
!   You can exit Rmail with @kbd{q} (@code{rmail-quit}); this expunges
! and saves the Rmail file, then buries the Rmail buffer as well as its
! summary buffer (@pxref{Rmail Summary}), if present.  But there is no
! need to ``exit'' formally.  If you switch from Rmail to editing in
! other buffers, and never happen to switch back, you have exited.  Just
! make sure to save the Rmail file eventually (like any other file you
! have changed).  @kbd{C-x s} is a good enough way to do this
! (@pxref{Saving}).  The Rmail command @kbd{b}, @code{rmail-bury},
! buries the Rmail buffer and its summary buffer without expunging and
! saving the Rmail file.
  
  @node Rmail Scrolling
  @section Scrolling Within a Message
***************
*** 255,262 ****
  messages already deleted, while @kbd{C-d} (@code{rmail-delete-backward})
  moves to the previous nondeleted message.  If there is no nondeleted
  message to move to in the specified direction, the message that was just
! deleted remains current.  A numeric argument to either command reverses
! the direction of motion after deletion.
  
  @vindex rmail-delete-message-hook
    Whenever Rmail deletes a message, it runs the hook
--- 257,264 ----
  messages already deleted, while @kbd{C-d} (@code{rmail-delete-backward})
  moves to the previous nondeleted message.  If there is no nondeleted
  message to move to in the specified direction, the message that was just
! deleted remains current.  @kbd{d} with a numeric argument is
! equivalent to @kbd{C-d}.
  
  @vindex rmail-delete-message-hook
    Whenever Rmail deletes a message, it runs the hook
***************
*** 317,323 ****
  or @file{/usr/mail/@var{username}}, depending on your operating system.
  
    To see what the default is on your system, use @kbd{C-h v
! rmail-primary-inbox @key{RET}}.  You can specify the inbox file(s) for
  any Rmail file with the command @code{set-rmail-inbox-list}; see
  @ref{Rmail Files}.
  
--- 319,325 ----
  or @file{/usr/mail/@var{username}}, depending on your operating system.
  
    To see what the default is on your system, use @kbd{C-h v
! rmail-primary-inbox-list @key{RET}}.  You can specify the inbox file(s) for
  any Rmail file with the command @code{set-rmail-inbox-list}; see
  @ref{Rmail Files}.
  
***************
*** 508,520 ****
  the regular expression).
  
  @vindex rmail-delete-after-output
!   Copying a message gives the original copy of the message the
! @samp{filed} attribute, so that @samp{filed} appears in the mode line
! when such a message is current.  If you like to keep just a single copy
! of every mail message, set the variable @code{rmail-delete-after-output}
! to @code{t}; then the @kbd{o} and @kbd{C-o} commands delete the original
! message after copying it.  (You can undelete the original afterward if
! you wish.)
  
    Copying messages into files in system inbox format uses the header
  fields that are displayed in Rmail at the time.  Thus, if you use the
--- 510,523 ----
  the regular expression).
  
  @vindex rmail-delete-after-output
!   Copying a message with @kbd{o} or @kbd{C-o} gives the original copy
! of the message the @samp{filed} attribute, so that @samp{filed}
! appears in the mode line when such a message is current.  @kbd{w}
! gives it the @samp{stored} attribute.  If you like to keep just a
! single copy of every mail message, set the variable
! @code{rmail-delete-after-output} to @code{t}; then the @kbd{o},
! @kbd{C-o} and @kbd{w} commands delete the original message after
! copying it.  (You can undelete the original afterward if you wish.)
  
    Copying messages into files in system inbox format uses the header
  fields that are displayed in Rmail at the time.  Thus, if you use the
***************
*** 567,573 ****
  @item C-M-p @var{labels} @key{RET}
  Move to the previous message that has one of the labels @var{labels}
  (@code{rmail-previous-labeled-message}).
! @item C-M-l @var{labels} @key{RET}
  Make a summary of all messages containing any of the labels @var{labels}
  (@code{rmail-summary-by-labels}).
  @end table
--- 570,577 ----
  @item C-M-p @var{labels} @key{RET}
  Move to the previous message that has one of the labels @var{labels}
  (@code{rmail-previous-labeled-message}).
! @item l @var{labels} @key{RET}
! @itemx C-M-l @var{labels} @key{RET}
  Make a summary of all messages containing any of the labels @var{labels}
  (@code{rmail-summary-by-labels}).
  @end table
***************
*** 626,632 ****
  removed by undeletion commands (@pxref{Rmail Deletion}).
  @item filed
  Means the message has been copied to some other file.  Assigned by the
! file output commands (@pxref{Rmail Files}).
  @item answered
  Means you have mailed an answer to the message.  Assigned by the @kbd{r}
  command (@code{rmail-reply}).  @xref{Rmail Reply}.
--- 630,638 ----
  removed by undeletion commands (@pxref{Rmail Deletion}).
  @item filed
  Means the message has been copied to some other file.  Assigned by the
! @kbd{o} and @kbd{C-o} file output commands (@pxref{Rmail Output}).
! @item stored
! Assigned by the @kbd{w} file output command (@pxref{Rmail Output}).
  @item answered
  Means you have mailed an answer to the message.  Assigned by the @kbd{r}
  command (@code{rmail-reply}).  @xref{Rmail Reply}.
***************
*** 912,917 ****
--- 918,929 ----
  Move to the last line, and select its message.
  @item <
  Move to the first line, and select its message.
+ @item j
+ @itemx @key{RET}
+ Select the message on the current line (ensuring that the RMAIL buffer
+ appears on the screen).  With argument @var{n}, select message number
+ @var{n} and move to its line in the summary buffer; this signals an
+ error if the message is not listed in the summary buffer.
  @item M-s @var{pattern} @key{RET}
  Search through messages for @var{pattern} starting with the current
  message; select the message found, and move point in the summary buffer
***************
*** 1263,1269 ****
  specify the user password, @var{host-or-file-name} is the name or IP
  address of the remote mail server to connect to; e.g.,
  @code{pop://smith:guessme@@remote.server.net}.
!  
  @item imap
  A remote mailbox to be accessed via IMAP4 protocol.  @var{User}
  specifies the remote user name to use, @var{pass} may be used to
--- 1275,1281 ----
  specify the user password, @var{host-or-file-name} is the name or IP
  address of the remote mail server to connect to; e.g.,
  @code{pop://smith:guessme@@remote.server.net}.
! 
  @item imap
  A remote mailbox to be accessed via IMAP4 protocol.  @var{User}
  specifies the remote user name to use, @var{pass} may be used to
***************
*** 1287,1293 ****
  @code{nil}, Rmail searches for @code{movemail} in the directories
  listed in @code{rmail-movemail-search-path} and @code{exec-path}, then
  in @code{exec-directory}.
!   
  @node Remote Mailboxes
  @section Retrieving Mail from Remote Mailboxes
  @pindex movemail
--- 1299,1305 ----
  @code{nil}, Rmail searches for @code{movemail} in the directories
  listed in @code{rmail-movemail-search-path} and @code{exec-path}, then
  in @code{exec-directory}.
! 
  @node Remote Mailboxes
  @section Retrieving Mail from Remote Mailboxes
  @pindex movemail
***************
*** 1317,1327 ****
  @samp{pop://@var{username}:@var{password}@@@var{hostname}}.  In this
  case, @var{password} takes preference over the one set by
  @code{rmail-remote-password}.  This is especially useful if you have
! several remote mailboxes with different passwords. 
  
    For backward compatibility Rmail also supports two alternative ways
  of specifying remote POP mailboxes.  Specifying inbox name in the form
! @samp{po:@var{username}:@var{hostname}} is equivalent to 
  @samp{pop://@var{username}@@@var{hostname}}.  Alternatively, you may set
  a ``file name'' of @samp{po:@var{username}} in the inbox list of an
  Rmail file.  @code{Movemail} will handle such a name by opening a
--- 1329,1339 ----
  @samp{pop://@var{username}:@var{password}@@@var{hostname}}.  In this
  case, @var{password} takes preference over the one set by
  @code{rmail-remote-password}.  This is especially useful if you have
! several remote mailboxes with different passwords.
  
    For backward compatibility Rmail also supports two alternative ways
  of specifying remote POP mailboxes.  Specifying inbox name in the form
! @samp{po:@var{username}:@var{hostname}} is equivalent to
  @samp{pop://@var{username}@@@var{hostname}}.  Alternatively, you may set
  a ``file name'' of @samp{po:@var{username}} in the inbox list of an
  Rmail file.  @code{Movemail} will handle such a name by opening a
***************
*** 1333,1339 ****
  supported only by the @code{mailutils movemail}.  To specify an IMAP
  mailbox in the inbox list, use the following mailbox @acronym{URL}:
  @samp{imap://@var{username}[:@var{password}]@@@var{hostname}}.  The
! @var{password} part is optional, as descrbed above.
  
  @vindex rmail-remote-password
  @vindex rmail-remote-password-required
--- 1345,1351 ----
  supported only by the @code{mailutils movemail}.  To specify an IMAP
  mailbox in the inbox list, use the following mailbox @acronym{URL}:
  @samp{imap://@var{username}[:@var{password}]@@@var{hostname}}.  The
! @var{password} part is optional, as described above.
  
  @vindex rmail-remote-password
  @vindex rmail-remote-password-required
***************
*** 1343,1352 ****
  following algorithm to retrieve it:
  
  @enumerate
! @item 
  If the @var{password} is present in mailbox URL (see above), it is
  used.
! @item 
  If the variable @code{rmail-remote-password} is address@hidden, its
  value is used.
  @item
--- 1355,1364 ----
  following algorithm to retrieve it:
  
  @enumerate
! @item
  If the @var{password} is present in mailbox URL (see above), it is
  used.
! @item
  If the variable @code{rmail-remote-password} is address@hidden, its
  value is used.
  @item