# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1095413202 0
# Node ID 55b7f2525e9297a45e6faf23423ddf378267f914
# Parent  959bd7a4b7df723c2a10352048988ec3e998d540
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-552

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-27
   Use the same directory explicit id-tags as Emacs where possible

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-28
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-29
   Update from CVS

diff -r 959bd7a4b7df -r 55b7f2525e92 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Sep 15 17:03:13 2004 +0000
+++ b/lisp/gnus/ChangeLog	Fri Sep 17 09:26:42 2004 +0000
@@ -1,3 +1,12 @@
+2004-09-16  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-sum.el (gnus-fetch-old-headers): Added custom choices `t'
+	and `invisible'.
+
+2004-09-13  Simon Josefsson  <jas@extundo.com>
+
+	* nnimap.el (nnimap-demule): Revert 2004-08-30 change.
+
 2004-09-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-sum.el (gnus-summary-copy-article): Fixed doc string.
diff -r 959bd7a4b7df -r 55b7f2525e92 lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Wed Sep 15 17:03:13 2004 +0000
+++ b/lisp/gnus/gnus-sum.el	Fri Sep 17 09:26:42 2004 +0000
@@ -63,7 +63,7 @@
   "*Non-nil means that Gnus will try to build threads by grabbing old headers.
 If an unread article in the group refers to an older, already read (or
 just marked as read) article, the old article will not normally be
-displayed in the Summary buffer.  If this variable is non-nil, Gnus
+displayed in the Summary buffer.  If this variable is t, Gnus
 will attempt to grab the headers to the old articles, and thereby
 build complete threads.  If it has the value `some', only enough
 headers to connect otherwise loose threads will be displayed.  This
@@ -74,7 +74,9 @@
 The server has to support NOV for any of this to work."
   :group 'gnus-thread
   :type '(choice (const :tag "off" nil)
+		 (const :tag "on" t)
 		 (const some)
+		 (const invisible)
 		 number
 		 (sexp :menu-tag "other" t)))
 
diff -r 959bd7a4b7df -r 55b7f2525e92 lisp/gnus/nnimap.el
--- a/lisp/gnus/nnimap.el	Wed Sep 15 17:03:13 2004 +0000
+++ b/lisp/gnus/nnimap.el	Fri Sep 17 09:26:42 2004 +0000
@@ -812,9 +812,11 @@
   ;; BEWARE: we used to use string-as-multibyte here which is braindead
   ;; because it will turn accidental emacs-mule-valid byte sequences
   ;; into multibyte chars.  --Stef
-  (funcall (if (and (fboundp 'string-to-multibyte)
-		    (subrp (symbol-function 'string-to-multibyte)))
-	       'string-to-multibyte
+  ;; Reverted, braindead got 7.5 out of 10 on imdb, so it can't be
+  ;; that bad. --Simon
+  (funcall (if (and (fboundp 'string-as-multibyte)
+		    (subrp (symbol-function 'string-as-multibyte)))
+	       'string-as-multibyte
 	     'identity)
 	   (or string "")))