From: yamaoka <yamaoka>
Date: Fri, 4 Jun 2004 07:04:03 +0000 (+0000)
Subject: Synch to No Gnus 200406040702.
X-Git-Tag: t-gnus-6_17_4-quimby-~878
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=290d6d8315bd0bf575178c4518ed00e57a0cd7ac;p=elisp%2Fgnus.git-

Synch to No Gnus 200406040702.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56bbf6e..9278ce8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (article-hide-headers): Refer to the values for
+	gnus-ignored-headers and gnus-visible-headers in the summary
+	buffer since a user may have set them as group parameters.
+
 2004-06-03  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* assistant.el (assistant-node-name): new convenience function
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index ce20171..19624e7 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1697,25 +1697,34 @@ Initialized from `text-mode-syntax-table.")
 	(when (eq 1 (point-min))
 	  (set-window-start (get-buffer-window (current-buffer)) 1)))
     (unless gnus-inhibit-hiding
-      (save-excursion
-	(save-restriction
-	  (let ((inhibit-read-only t)
-		(case-fold-search t)
-		(max (1+ (length gnus-sorted-header-list)))
-		(ignored (when (not gnus-visible-headers)
-			   (cond ((stringp gnus-ignored-headers)
-				  gnus-ignored-headers)
-				 ((listp gnus-ignored-headers)
-				  (mapconcat 'identity gnus-ignored-headers
-					     "\\|")))))
-		(visible
-		 (cond ((stringp gnus-visible-headers)
-			gnus-visible-headers)
-		       ((and gnus-visible-headers
-			     (listp gnus-visible-headers))
-			(mapconcat 'identity gnus-visible-headers "\\|"))))
-		(inhibit-point-motion-hooks t)
-		beg)
+      (let ((inhibit-read-only t)
+	    (case-fold-search t)
+	    (max (1+ (length gnus-sorted-header-list)))
+	    (inhibit-point-motion-hooks t)
+	    ignored visible beg)
+	(save-excursion
+	  ;; `gnus-ignored-headers' and `gnus-visible-headers' may be
+	  ;; group parameters, so we should go to the summary buffer.
+	  (when (prog1
+		    (condition-case nil
+			(progn (set-buffer gnus-summary-buffer) t)
+		      (error nil))
+		  (setq ignored (when (not gnus-visible-headers)
+				  (cond ((stringp gnus-ignored-headers)
+					 gnus-ignored-headers)
+					((listp gnus-ignored-headers)
+					 (mapconcat 'identity
+						    gnus-ignored-headers
+						    "\\|"))))
+			visible (cond ((stringp gnus-visible-headers)
+				       gnus-visible-headers)
+				      ((and gnus-visible-headers
+					    (listp gnus-visible-headers))
+				       (mapconcat 'identity
+						  gnus-visible-headers
+						  "\\|")))))
+	    (set-buffer gnus-article-buffer))
+	  (save-restriction
 	    ;; First we narrow to just the headers.
 	    (article-narrow-to-head)
 	    ;; Hide any "From " lines at the beginning of (mail) articles.