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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c072a77a80798322901fefcc363a88315fe77c38..0bdf47226ffbe292daae550bdebf3805677f6f21 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index abbecbbdff28374d973f86f4a0d1c54fc1e62e2c..6c7c0436bc2e9dfb954028f71b4fd2baf9451a15 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -6013,8 +6013,7 @@ the subject line on."
       ;; 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