Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 810ffee..0c3ebd0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-25  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-mode): Fix doc.
+
+2002-03-25  Simon Josefsson  <jas@extundo.com>
+
+       * message.el (message-subject-re-regexp): Skip Re[42]: junk.  From
+       Matthieu Moy <Matthieu.Moy@imag.fr>.
+
 2002-03-24  Jesper Harder  <harder@ifa.au.dk>
        
        * mml-sec.el (mml-unsecure-message): Add docstring.

diff --git a/lisp/message.el b/lisp/message.el
index 42672bc..d6a920f 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -285,7 +285,8 @@ any confusion."
   :group 'message-sending
   :type 'function)
 
-(defcustom message-subject-re-regexp "^[ \t]*\\([Rr][Ee]:[ \t]*\\)*[ \t]*"
+(defcustom message-subject-re-regexp
+  "^[ \t]*\\([Rr][Ee]\\(\\[[0-9]*\\]\\)*:[ \t]*\\)*[ \t]*"
   "*Regexp matching \"Re: \" in the subject line."
   :group 'message-various
   :type 'regexp)
@@ -1989,6 +1990,7 @@ C-c C-f  move to a header field (and create it if there isn't):
         C-c C-f C-w  move to Fcc       C-c C-f C-r  move to Reply-To
         C-c C-f C-u  move to Summary   C-c C-f C-n  move to Newsgroups
         C-c C-f C-k  move to Keywords  C-c C-f C-d  move to Distribution
+         C-c C-f C-o  move to From (\"Originator\")
         C-c C-f C-f  move to Followup-To
         C-c C-f C-m  move to Mail-Followup-To
         C-c C-f C-i  cycle through Importance values

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 6084a7a..e0760bb 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-25  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Mail Spool): Add cindex for marks.
+       (Mail Folders): Add cindex for marks.
+
 2002-03-24  Raymond Scholz <rscholz@zonix.de>
 
        * gnus.texi (Summary Buffer Lines): Fix doc.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 0d9a3eb..f3e806c 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -13215,6 +13215,7 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 \e$B$rFI$`;v$K4X$7$F$O$?$V$s:GB.$N%P%C%/%(%s%I$K$J$j$^$9!#\e(B
 
 @cindex self contained nnml servers
+@cindex marks
 \e$B0u%U%!%$%k\e(B (\e$BLuCm\e(B: marks file) \e$B$,;H$o$l$k$H\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9$,\e(B)\e$B!"\e(B
 @code{nnml} \e$B%5!<%P!<$O\e(B @code{tar} \e$B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e$G$"\e(B
 \e$B$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G\e(B gnus \e$B$KLa$9\e(B (\e$BK\Mh$N\e(B @code{nnml} \e$B%5!<\e(B
@@ -13334,6 +13335,7 @@ rmail box \e$B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM\e(B
 \e$B$($^$9!#\e(B
 
 @cindex self contained nnfolder servers
+@cindex marks
 \e$B0u%U%!%$%k\e(B (\e$BLuCm\e(B: marks file) \e$B$,;H$o$l$k$H\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9$,\e(B)\e$B!"\e(B
 @code{nnfolder} \e$B%5!<%P!<$O\e(B @code{tar} \e$B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e\e(B
 \e$B$G$"$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G\e(B gnus \e$B$KLa$9\e(B (\e$BK\Mh\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 92eb70d..f7aa73c 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -13816,6 +13816,7 @@ splitting.  It has to create lots of files, and it also generates
 fastest back end when it comes to reading mail.
 
 @cindex self contained nnml servers
+@cindex marks
 When the marks file is used (which it is by default), @code{nnml}
 servers have the property that you may backup them using @code{tar} or
 similar, and later be able to restore them into Gnus (by adding the
@@ -13940,6 +13941,7 @@ will add extra headers to keep track of article numbers and arrival
 dates.
 
 @cindex self contained nnfolder servers
+@cindex marks
 When the marks file is used (which it is by default), @code{nnfolder}
 servers have the property that you may backup them using @code{tar} or
 similar, and later be able to restore them into Gnus (by adding the