From: Miles Bader <miles@gnu.org>
Date: Fri, 17 Sep 2004 09:26:42 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-552
X-Git-Tag: ttn-vms-21-2-B4~4902
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1232b9cbdef913b799c7423d7a39ddb0e30138bd;p=emacs.git

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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 668607af94d..46b673ce540 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 02757fff4dd..029af64aa6c 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -63,7 +63,7 @@ it will be killed sometime later."
   "*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 @@ old headers will be fetched, but none will be displayed.
 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 --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 08aa48a5948..19abb629a1d 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -812,9 +812,11 @@ function is generally only called when Gnus is shutting down."
   ;; 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 "")))