[Emacs-diffs] emacs doc/misc/gnus.texi doc/misc/ChangeLog lis...

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/12/06 17:26:20

Modified files:
        doc/misc       : gnus.texi ChangeLog 
        lisp/gnus      : ChangeLog gnus-score.el 

Log message:
        Merge from gnus--devo--0
        
        Revision: address@hidden/emacs--devo--0--patch-1490

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/misc/gnus.texi?cvsroot=emacs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/misc/ChangeLog?cvsroot=emacs&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.774&r2=1.775
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/gnus-score.el?cvsroot=emacs&r1=1.38&r2=1.39

Patches:
Index: doc/misc/gnus.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/misc/gnus.texi,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- doc/misc/gnus.texi  19 Nov 2008 04:28:41 -0000      1.36
+++ doc/misc/gnus.texi  6 Dec 2008 17:26:18 -0000       1.37
@@ -4450,7 +4450,9 @@
 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
@@ -4482,21 +4484,22 @@
 about corrupt index files when mairix changed the contents of the search
 group).  Using @code{nnmairix} should circumvent these problems.
 
address@hidden 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
address@hidden  @code{nnmairix} will call the mairix binary so that the
-search results are stored in folders named
address@hidden 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},
address@hidden 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
address@hidden server exclusively for mairix.  However, a special case
-exists if you want to use mairix remotely on an IMAP server with
address@hidden 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
address@hidden 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 @@
 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
address@hidden 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 @@
 propagation feature efficiently. Otherwise, you would have to update
 the mairix database all the time. You can get the patch at
 
address@hidden://m61s02.vlinux.de/mairix-maildir-patch.tar}
address@hidden://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 @@
 
 @itemize
 @item
-If you use the Gnus agent (@pxref{Gnus Unplugged}): don't agentize
address@hidden 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
address@hidden 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:
+
address@hidden
+(nnml "mairix" (nnml-directory "mairix") (nnml-get-new-mail nil))
address@hidden lisp
+
+(The @code{nnmaildir} back end also has a server variabe
address@hidden, 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 @@
 groups (you shouldn't be able to, anyway).
 
 @item
+If you use the Gnus agent (@pxref{Gnus Unplugged}): don't agentize
address@hidden groups (though I have no idea what happens if you do).
+
address@hidden
 mairix does only support us-ascii characters.
 
 @item

Index: doc/misc/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/misc/ChangeLog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- doc/misc/ChangeLog  2 Dec 2008 16:40:32 -0000       1.209
+++ doc/misc/ChangeLog  6 Dec 2008 17:26:19 -0000       1.210
@@ -1,3 +1,8 @@
+2008-12-04  David Engster  <address@hidden>
+
+       * 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  <address@hidden>
 
        * calc.texi (About This Manual): Clarify behavior of `C-x * t'.

Index: lisp/gnus/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -b -r1.774 -r1.775
--- lisp/gnus/ChangeLog 4 Dec 2008 10:53:19 -0000       1.774
+++ lisp/gnus/ChangeLog 6 Dec 2008 17:26:19 -0000       1.775
@@ -33,6 +33,11 @@
        variable for debugging bug#464 and bug#1174.
        (nnimap-demule): Use it.
 
+2008-11-24  Reiner Steib  <address@hidden>
+
+       * gnus-score.el (gnus-score-find-trace): Handle default score in total
+       score calculation correctly.
+
 2008-11-21  Stefan Monnier  <address@hidden>
 
        * 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):

Index: lisp/gnus/gnus-score.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-score.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- lisp/gnus/gnus-score.el     4 Jul 2008 00:07:46 -0000       1.38
+++ lisp/gnus/gnus-score.el     6 Dec 2008 17:26:20 -0000       1.39
@@ -2469,7 +2469,11 @@
                   (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: