From 531a52a3dded874caa8f0745409254d5c676326c Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 24 Jun 2003 03:37:50 +0000
Subject: [PATCH] Synch to Gnus 200306240131.

---
 lisp/ChangeLog     |    6 ++++++
 lisp/gnus-srvr.el  |    2 ++
 lisp/gnus-topic.el |    2 ++
 texi/ChangeLog     |    5 +++++
 texi/gnus-ja.texi  |    3 ++-
 texi/gnus.texi     |    3 ++-
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85bca75..fdb0a61 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2003-06-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-srvr.el (gnus-browse-unsubscribe-group): Strip prefix from
+	native groups.
+
+	* gnus-topic.el (gnus-group-prepare-topics): Update topic line
+	format specs.
+
 	* gnus-picon.el: Written by moi, moi, moi.
 
 	* gnus-group.el (gnus-group-kill-group): Clean up.
diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index f50e39a..3bfa7ee 100644
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -911,6 +911,8 @@ buffer.
       (unless (eq (char-after) ? )
 	(setq sub t))
       (setq group (gnus-browse-group-name))
+      (when (gnus-server-equal gnus-browse-current-method "native")
+	(setq group (gnus-group-real-name group)))
       (if sub
 	  (progn
 	    ;; Make sure the group has been properly removed before we
diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index 002a3a3..b74e69b 100644
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -436,6 +436,8 @@ If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
 	 (and gnus-group-listed-groups
 	      (copy-sequence gnus-group-listed-groups))))
 
+    (gnus-update-format-specifications nil 'topic)
+    
     (when (or (not gnus-topic-alist)
 	      (not gnus-topology-checked-p))
       (gnus-topic-check-topology))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index cb5de50..784b171 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.texi (Summary Mail Commands): Make note of
+	Mail-Followup-To. 
+
 2003-06-23  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus.texi: Formatting fixes.
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 56f4e88..0ac653a 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -5131,7 +5131,8 @@ Summary Buffer} を参照して下さい。
 現在の記事を書いた人に対して、広い返答 (wide reply) をしま
 す (@code{gnus-summary-wide-reply})。@dfn{広い返答} とはヘッダー
 の @code{To}, @code{From}, (もしくは @code{Reply-to}) と @code{Cc}) のす
-べての人に返答をすることです。
+べての人に返答をすることです。@code{Mail-Followup-To} があれば、代わりに
+それが使われます。
 
 @item S W
 @kindex S W (概略)
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 0d92a73..acdf0a1 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -5227,7 +5227,8 @@ command uses the process/prefix convention.
 Mail a wide reply to the author of the current article
 (@code{gnus-summary-wide-reply}).  A @dfn{wide reply} is a reply that
 goes out to all people listed in the @code{To}, @code{From} (or
-@code{Reply-to}) and @code{Cc} headers.
+@code{Reply-to}) and @code{Cc} headers.  If @code{Mail-Followup-To} is
+present, that's used instead.
 
 @item S W
 @kindex S W (Summary)
-- 
1.7.10.4