Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1490

4 files changed, 60 insertions, 24 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ecd7767ac86..82e0cfc47cf 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-04  David Engster  <dengste@eml.cc>
+
+        * gnus.texi (nnmairix): Mention mairix.el.  Point out the importance
+          of nnml-get-new-mail.  Change URL for mairix patch.
+
 2008-12-01  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (About This Manual): Clarify behavior of `C-x * t'.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index f9395183376..874be2ca125 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -4450,7 +4450,9 @@ one of these back ends for using @code{nnmairix}.  Other back ends, like
 If you absolutely must use mbox and still want to use @code{nnmairix},
 you can set up a local @acronym{IMAP} server, which you then access via
 @code{nnimap}.  This is a rather massive setup for accessing some mbox
-files, so just change to MH or Maildir already...
+files, so just change to MH or Maildir already...  However, if you're
+really, really passionate about using mbox, you might want to look into
+the package @file{mairix.el}, which comes with Emacs 23.
 
 @node What nnmairix does
 @subsubsection What nnmairix does
@@ -4472,7 +4474,7 @@ automatically update themselves by calling mairix.
 
 You might ask why you need @code{nnmairix} at all, since mairix already
 creates the group, populates it with links to the mails so that you can
-then access it with Gnus, right? Well, this @emph{might} work, but often
+then access it with Gnus, right?  Well, this @emph{might} work, but often
 does not---at least not without problems.  Most probably you will get
 strange article counts, and sometimes you might see mails which Gnus
 claims have already been canceled and are inaccessible.  This is due to
@@ -4482,21 +4484,22 @@ use mairix with an @acronym{IMAP} server (I had Dovecot complaining
 about corrupt index files when mairix changed the contents of the search
 group).  Using @code{nnmairix} should circumvent these problems.
 
-@code{nnmairix} is not really a mail back end---it's actually more like a
-wrapper, sitting between a ``real'' mail back end where mairix stores the
-searches and the Gnus front end.  You can choose between three different
-mail back ends for the mairix folders: @code{nnml}, @code{nnmaildir} or
-@code{nnimap}.  @code{nnmairix} will call the mairix binary so that the
-search results are stored in folders named
+@code{nnmairix} is not really a mail back end---it's actually more like
+a wrapper, sitting between a ``real'' mail back end where mairix stores
+the searches and the Gnus front end.  You can choose between three
+different mail back ends for the mairix folders: @code{nnml},
+@code{nnmaildir} or @code{nnimap}.  @code{nnmairix} will call the mairix
+binary so that the search results are stored in folders named
 @code{zz_mairix-<NAME>-<NUMBER>} on this mail back end, but it will
-present these folders in the Gnus front end only with @code{<NAME>}.  You
-can use an existing mail back end where you already store your mail, but
-if you're uncomfortable with @code{nnmairix} creating new mail groups
-alongside your other mail, you can also create e.g. a new
-@code{nnmaildir} server exclusively for mairix.  However, a special case
-exists if you want to use mairix remotely on an IMAP server with
-@code{nnimap}---here the mairix folders and your other mail must be on
-the same @code{nnimap} back end.
+present these folders in the Gnus front end only with @code{<NAME>}.
+You can use an existing mail back end where you already store your mail,
+but if you're uncomfortable with @code{nnmairix} creating new mail
+groups alongside your other mail, you can also create e.g. a new
+@code{nnmaildir} or @code{nnml} server exclusively for mairix, but then
+make sure those servers do not accidentally receive your new mail
+(@pxref{nnmairix caveats}).  A special case exists if you want to use
+mairix remotely on an IMAP server with @code{nnimap}---here the mairix
+folders and your other mail must be on the same @code{nnimap} back end.
 
 @node Setting up mairix
 @subsubsection Setting up mairix
@@ -4600,9 +4603,12 @@ Just hit @kbd{TAB} to see the available servers.  Currently, servers
 which are accessed through @code{nnmaildir}, @code{nnimap} and
 @code{nnml} are supported.  As explained above, for locally stored
 mails, this can be an existing server where you store your mails.
-However, you can also create e.g. a new @code{nnmaildir} server
-exclusively for @code{nnmairix} in your secondary select methods
-(@pxref{Finding the News}).  If you want to use mairix remotely on an
+However, you can also create e.g. a new @code{nnmaildir} or @code{nnml}
+server exclusively for @code{nnmairix} in your secondary select methods
+(@pxref{Finding the News}).  If you use a secondary @code{nnml} server
+just for mairix, make sure that you explicitly set the server variable
+@code{nnml-get-new-mail} to @code{nil}, or you might loose mail
+(@pxref{nnmairix caveats}).  If you want to use mairix remotely on an
 @acronym{IMAP} server, you have to choose the corresponding
 @code{nnimap} server here.
 
@@ -4794,7 +4800,7 @@ First of: you really need a patched mairix binary for using the marks
 propagation feature efficiently. Otherwise, you would have to update
 the mairix database all the time. You can get the patch at
 
-@uref{http://m61s02.vlinux.de/mairix-maildir-patch.tar}
+@uref{http://www.randomsample.de/mairix-maildir-patch.tar}
 
 You need the mairix v0.21 source code for this patch; everything else
 is explained in the accompanied readme file. If you don't want to use
@@ -4974,8 +4980,20 @@ for turning it off for all groups beginning with @samp{zz_}:
 
 @itemize
 @item
-If you use the Gnus agent (@pxref{Gnus Unplugged}): don't agentize
-@code{nnmairix} groups (though I have no idea what happens if you do).
+You can create a secondary @code{nnml} server just for nnmairix, but then
+you have to explicitly set the corresponding server variable
+@code{nnml-get-new-mail} to @code{nil}.  Otherwise, new mail might get
+put into this secondary server (and would never show up again).  Here's
+an example server definition:
+
+@lisp
+(nnml "mairix" (nnml-directory "mairix") (nnml-get-new-mail nil))
+@end lisp
+
+(The @code{nnmaildir} back end also has a server variabe
+@code{get-new-mail}, but its default value is @code{nil}, so you don't
+have to explicitly set it if you use a @code{nnmaildir} server just for
+mairix.)
 
 @item
 If you use the Gnus registry: don't use the registry with
@@ -4990,6 +5008,10 @@ Therefore: @emph{Never ever} put ``real'' mails into @code{nnmairix}
 groups (you shouldn't be able to, anyway).
 
 @item
+If you use the Gnus agent (@pxref{Gnus Unplugged}): don't agentize
+@code{nnmairix} groups (though I have no idea what happens if you do).
+
+@item
 mairix does only support us-ascii characters.
 
 @item
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 535cbd065f5..59535f7faa5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -33,6 +33,11 @@
         variable for debugging bug#464 and bug#1174.
         (nnimap-demule): Use it.
 
+2008-11-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-score.el (gnus-score-find-trace): Handle default score in total
+        score calculation correctly.
+
 2008-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * message.el (message-send-mail): Just set the buffer to unibyte
@@ -1538,7 +1543,7 @@
         * gnus-uu.el (gnus-uu-yenc-article): Use insert-buffer-substring.
 
         * gnus-art.el, gnus-spec.el, gnus-sum.el, gnus-util.el:
-        * message.el, mm-view.el, sieve-manage, smime.el:
+        * message.el, mm-view.el, sieve-manage.el, smime.el:
         Add declare-function compatibility definition.
 
         * gnus-art.el (w3-region, w3m-region, Info-menu):
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 1390db3acd0..7f936bae333 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -2469,7 +2469,11 @@ score in `gnus-newsgroup-scored' by SCORE."
                    (abbreviate-file-name file))))
         (insert
          (format "\nTotal score: %d"
-                 (apply '+ (mapcar 'caddr trace))))
+                 (apply '+ (mapcar
+                            (lambda (s)
+                              (or (caddr s)
+                                  gnus-score-interactive-default-score))
+                            trace))))
         (insert
          "\n\nQuick help: