# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1097077905 0
# Node ID c9d90ef9b02cc85adac39cbc01080632f3c39ec6
# Parent  99039d610cb0c91f627b88e443a12c5cdd5db13f
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-599

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-42
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-43
   Merge from emacs--cvs-trunk--0

diff -r 99039d610cb0 -r c9d90ef9b02c lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Oct 06 15:46:19 2004 +0000
+++ b/lisp/gnus/ChangeLog	Wed Oct 06 15:51:45 2004 +0000
@@ -1,3 +1,7 @@
+2004-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-sum.el (gnus-summary-insert-subject): Remove redundant setq.
+
 2004-10-05  Juri Linkov  <juri@jurta.org>
 
 	* gnus-group.el (gnus-update-group-mark-positions):
diff -r 99039d610cb0 -r c9d90ef9b02c lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Wed Oct 06 15:46:19 2004 +0000
+++ b/lisp/gnus/gnus-sum.el	Wed Oct 06 15:51:45 2004 +0000
@@ -6013,8 +6013,7 @@
       ;; Remove list identifiers from subject.
       (when gnus-list-identifiers
 	(let ((gnus-newsgroup-headers (list header)))
-	  (gnus-summary-remove-list-identifiers)
-	  (setq header (car gnus-newsgroup-headers))))
+	  (gnus-summary-remove-list-identifiers)))
       (when old-header
 	(mail-header-set-number header (mail-header-number old-header)))
       (setq gnus-newsgroup-sparse