From dc9c7ad693699ae99d91ff163c8fc4c10fe07d6e Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 16 Sep 2002 04:19:47 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog    |    5 +++++
 lisp/gnus-sum.el  |   60 ++++++++++++++++++++++++++---------------------------
 texi/ChangeLog    |    5 +++++
 texi/gnus-ja.texi |    3 ++-
 texi/gnus.texi    |   15 +++++++-------
 5 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2855146..acfa109 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-15 John Paul Wallington <jpw@shootybangbang.com>
+
+	* gnus-sum.el (gnus-summary-toggle-header): The article window may
+	not exist. Toggle it anyway.
+
 2002-09-13  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-msg.el (gnus-copy-article-buffer): Bind mail-header-separator.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index c513e7e..9ae9cef 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8482,37 +8482,37 @@ If ARG is a negative number, hide the unwanted header lines."
   (interactive "P")
   (let ((window (and (gnus-buffer-live-p gnus-article-buffer)
 		     (get-buffer-window gnus-article-buffer t))))
-    (when window
-      (with-current-buffer gnus-article-buffer
+    (with-current-buffer gnus-article-buffer
+      (widen)
+      (article-narrow-to-head)
+      (let* ((buffer-read-only nil)
+	     (inhibit-point-motion-hooks t)
+	     (hidden (if (numberp arg)
+			 (>= arg 0)
+		       (gnus-article-hidden-text-p 'headers)))
+	     s e)
+	(delete-region (point-min) (point-max))
+	(with-current-buffer gnus-original-article-buffer
+	  (goto-char (setq s (point-min)))
+	  (setq e (if (search-forward "\n\n" nil t)
+		      (1- (point))
+		    (point-max))))
+	(insert-buffer-substring gnus-original-article-buffer s e)
+	(article-decode-encoded-words)
+	(if hidden
+	    (let ((gnus-treat-hide-headers nil)
+		  (gnus-treat-hide-boring-headers nil))
+	      (gnus-delete-wash-type 'headers)
+	      (gnus-treat-article 'head))
+	  (gnus-treat-article 'head))
 	(widen)
-	(article-narrow-to-head)
-	(let* ((buffer-read-only nil)
-	       (inhibit-point-motion-hooks t)
-	       (hidden (if (numberp arg)
-			   (>= arg 0)
-			 (gnus-article-hidden-text-p 'headers)))
-	       s e)
-	  (delete-region (point-min) (point-max))
-	  (with-current-buffer gnus-original-article-buffer
-	    (goto-char (setq s (point-min)))
-	    (setq e (if (search-forward "\n\n" nil t)
-			(1- (point))
-		      (point-max))))
-	  (insert-buffer-substring gnus-original-article-buffer s e)
-	  (article-decode-encoded-words)
-	  (if hidden
-	      (let ((gnus-treat-hide-headers nil)
-		    (gnus-treat-hide-boring-headers nil))
-		(gnus-delete-wash-type 'headers)
-		(gnus-treat-article 'head))
-	    (gnus-treat-article 'head))
-	  (widen)
-	  (set-window-start window (goto-char (point-min)))
-	  (setq gnus-page-broken
-		(when gnus-break-pages
-		  (gnus-narrow-to-page)
-		  t))
-	  (gnus-set-mode-line 'article))))))
+	(if window
+	    (set-window-start window (goto-char (point-min))))
+	(setq gnus-page-broken
+	      (when gnus-break-pages
+		(gnus-narrow-to-page)
+		t))
+	(gnus-set-mode-line 'article)))))
 
 (defun gnus-summary-show-all-headers ()
   "Make all header lines visible."
diff --git a/texi/ChangeLog b/texi/ChangeLog
index a6f638f..d3c5612 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-15  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+	* gnus.texi (Mail Source Specifiers): Say "one-to-one
+	correspondence" in the description of `directory'.
+
 2002-09-11  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
 	* gnus.texi (Top, Summary Buffer): Add info to "Delayed Articles"
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index cc292b3..669ca7b 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -12120,7 +12120,8 @@ rm -f $TMP; $MOVEMAIL $MAIL $TMP >/dev/null && cat $TMP
 @vindex nnmail-scan-directory-mail-source-once
 $B%G%#%l%/%H%j!<Cf$NJ#?t$N%U%!%$%k$+$i%a!<%k$r<hF@$7$^$9!#$3$l$OIaDL(B
 $B$O(B procmail $B$K?7$7$$%a!<%k$r$$$/$D$+$N%U%!%$%k$KJ,3d$5$;$F$$$k$H$-$K;HMQ(B
-$B$5$l$^$9!#$9$J$o$A%U%!%$%k(B @file{foo.bar.spool} $B$K$"$k%a!<%k$O!"%0%k!<(B
+$B$5$l$^$9!#$9$J$o$A!"$=$N%G%#%l%/%H%j!<$K$"$k%U%!%$%k$H%0%k!<%W$O0lBP0l$G(B
+$BBP1~$7$F$$$k$N$G!"%U%!%$%k(B @file{foo.bar.spool} $B$K$"$k%a!<%k$O!"%0%k!<(B
 $B%W(B @code{foo.bar} $B$KCV$+$l$^$9(B ($B%5%U%#%C%/%9(B @code{.spool} $B$OJQ992DG=$G(B
 $B$9(B)$B!#(B@code{nnmail-scan-directory-mail-source-once} $B$r(B @code{nil} $B0J30$K(B
 $B$9$k$H!"(Bgnus $B$O?7$7$$%a!<%k%=!<%9$r0l2s$@$1D4$Y$k$h$&$K$J$j$^$9!#$3$l$O!"(B
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 6ac06b4..e1008d8 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12678,14 +12678,15 @@ Alter this script to fit find the @samp{movemail} you want to use.
 
 @item directory
 @vindex nnmail-scan-directory-mail-source-once
-Get mail from several files in a directory.  This is typically used
-when you have procmail split the incoming mail into several files.
-That is, mail from the file @file{foo.bar.spool} will be put in the
-group @code{foo.bar}.  (You can change the suffix to be used instead
+Get mail from several files in a directory.  This is typically used when
+you have procmail split the incoming mail into several files.  That is,
+there is a one-to-one correspondence between files in that directory and
+groups, so that mail from the file @file{foo.bar.spool} will be put in
+the group @code{foo.bar}.  (You can change the suffix to be used instead
 of @code{.spool}.)  Setting
-@code{nnmail-scan-directory-mail-source-once} to non-nil forces Gnus
-to scan the mail source only once.  This is particularly useful if you
-want to scan mail groups at a specified level.
+@code{nnmail-scan-directory-mail-source-once} to non-nil forces Gnus to
+scan the mail source only once.  This is particularly useful if you want
+to scan mail groups at a specified level.
 
 @vindex nnmail-resplit-incoming
 There is also the variable @code{nnmail-resplit-incoming}, if you set
-- 
1.7.10.4