Synch to No Gnus 200410060926.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a223e99..7e0b7a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,8 +6,8 @@
        * gnus-art.el (gnus-display-mime): Use mm-uu-dissect-text-parts to
        dissect text parts.
 
-       * gnus-sum.el (gnus-summary-force-verify-and-decrypt): Revert
-       2004-08-18 change.
+       * gnus-sum.el (gnus-summary-insert-subject): Remove redundant setq.
+       (gnus-summary-force-verify-and-decrypt): Revert 2004-08-18 change.
 
        * mm-decode.el (mm-dissect-singlepart): Revert 2004-08-18 change.
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index bb37b0b..7931d93 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6064,8 +6064,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