From 26ef0f542bf21c31511679f4369581ef05631406 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 2 Jun 2003 23:17:04 +0000
Subject: [PATCH] Synch to Gnus 200306022252.

---
 lisp/ChangeLog        |   11 +++++++++++
 lisp/gnus-cus.el      |   10 ++++++++++
 lisp/gnus-registry.el |    2 +-
 lisp/gnus-sum.el      |    1 +
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1ce47d..bb66feb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-02  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-registry.el (gnus-registry-fetch-group): always return the
+	short name of the group
+
+2003-06-02  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-cus.el (defvar): Silence byte-compiler warnings.
+
+	* gnus-sum.el (gnus-get-newsgroup-headers): Unfold headers.
+
 2003-05-31  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-art.el (article-unsplit-urls): Use gnus-treat-article
diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index fceeead..1b3cc02 100644
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -889,6 +889,16 @@ articles in the thread.
 
 (eval-when-compile
   (defvar category-fields nil)
+  (defvar gnus-agent-cat-name)
+  (defvar gnus-agent-cat-score-file)
+  (defvar gnus-agent-cat-length-when-short)
+  (defvar gnus-agent-cat-length-when-long)
+  (defvar gnus-agent-cat-low-score)
+  (defvar gnus-agent-cat-high-score)
+  (defvar gnus-agent-cat-enable-expiration)
+  (defvar gnus-agent-cat-days-until-old)
+  (defvar gnus-agent-cat-predicate)
+  (defvar gnus-agent-cat-groups)
 )
 
 (defun gnus-trim-whitespace (s)
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 4180aa1..54756a1 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -354,7 +354,7 @@ Returns the first place where the trail finds a group name."
     (let ((trail (gethash id gnus-registry-hashtb)))
       (dolist (crumb trail)
 	(when (stringp crumb)
-	  (return crumb))))))
+	  (return (gnus-group-short-name crumb)))))))
 
 (defun gnus-registry-group-count (id)
   "Get the number of groups of a message, based on the message ID."
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index d6d299b..e9c88f2 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5714,6 +5714,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
       ;; Translate all TAB characters into SPACE characters.
       (subst-char-in-region (point-min) (point-max) ?\t ?  t)
       (subst-char-in-region (point-min) (point-max) ?\r ?  t)
+      (ietf-drums-unfold-fws)
       (gnus-run-hooks 'gnus-parse-headers-hook)
       (let ((case-fold-search t)
 	    in-reply-to header p lines chars ctype)
-- 
1.7.10.4