Merge from gnus--devo--0

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

doc/misc/ChangeLog

+2008-02-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-news.texi: Mention problem with coding system `utf-8-emacs' when
+	using different Emacs versions.
+
 2008-02-27  Glenn Morris  <rgm@gnu.org>
 
 	* sc.texi: Remove a lot of old and obsolete info.

doc/misc/gnus-news.texi

@@ -32,6 +32,15 @@ file, where this release will store flags for nntp.  See a later entry
 for more information about nntp marks.  Note that downgrading isn't
 safe in general.
 
+@item Incompatibity when switching from Emacs 23 to Emacs 22 
+In Emacs 23, Gnus uses Emacs' new internal coding system @code{utf-8-emacs}
+for saving articles drafts and @file{~/.newsrc.eld}.  These file may not
+be read correctly in Emacs 22 and below.  If you want to Gnus across
+different Emacs versions, you may set @code{mm-auto-save-coding-system}
+to @code{emacs-mule}.
+@c FIXME: Untested.  (Or did anyone test it?)
+@c Cf. http://thread.gmane.org/gmane.emacs.gnus.general/66251/focus=66344
+
 @item Lisp files are now installed in @file{.../site-lisp/gnus/} by default.
 It defaulted to @file{.../site-lisp/} formerly.  In addition to this,
 the new installer issues a warning if other Gnus installations which

lisp/gnus/ChangeLog

+2008-02-26  David Engster  <dengste@eml.cc>
+
+	* nnmairix.el: New file.  Mairix back end for Gnus.  Initial import of
+	version 0.5.
+
+2008-02-26  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-registry.el (gnus-registry-register-message-ids): Use `id'
+	instead of making an extra function call.  Don't add the current group
+	to articles only when they have the group.  Use
+	`gnus-registry-fetch-groups' instead of `gnus-registry-fetch-group'.
+	Reported by David <de_bb@arcor.de>.
+
 2008-02-24  Miles Bader  <miles@gnu.org>
 
 	* mm-util.el (mm-hack-charsets, mm-iso-8859-15-compatible)

lisp/gnus/gnus-registry.el

@@ -334,7 +334,6 @@ considered precious) will not be trimmed."
 
 (defun gnus-registry-trim (alist)
   "Trim alist to size, using gnus-registry-max-entries.
-Also, drop all gnus-registry-ignored-groups matches.
 Any entries with extra data (marks, currently) are left alone."
   (if (null gnus-registry-max-entries)      
       alist                             ; just return the alist
@@ -360,7 +359,7 @@ Any entries with extra data (marks, currently) are left alone."
        gnus-registry-hashtb)
 
       (dolist (item alist)
-	(let ((key (nth 0 item)))	      
+	(let ((key (nth 0 item)))
 	  (if (gethash key precious)
 	      (push item precious-list)
 	    (push item junk-list))))
@@ -578,11 +577,11 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
   (unless (gnus-parameter-registry-ignore gnus-newsgroup-name)
     (dolist (article gnus-newsgroup-articles)
       (let ((id (gnus-registry-fetch-message-id-fast article)))
-	(unless (gnus-registry-fetch-group id)
+	(unless (member gnus-newsgroup-name (gnus-registry-fetch-groups id))
 	  (gnus-message 9 "Registry: Registering article %d with group %s"
 			article gnus-newsgroup-name)
-	  (gnus-registry-add-group
-	   (gnus-registry-fetch-message-id-fast article)
+	  (gnus-registry-add-group 
+	   id 
 	   gnus-newsgroup-name
 	   (gnus-registry-fetch-simplified-message-subject-fast article)
 	   (gnus-registry-fetch-sender-fast article)))))))