(article-decode-group-name): Replace Newsgroups and

[gnus] / lisp / gnus-art.el

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index e32d5bb..727edfb 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2122,20 +2122,24 @@ If PROMPT (the prefix), prompt for a coding system to use."
     (when (and (or gnus-group-name-charset-method-alist
                   gnus-group-name-charset-group-alist)
               (gnus-buffer-live-p gnus-original-article-buffer))
-      (when (nnmail-fetch-field "Newsgroups")
-       (nnheader-replace-header "Newsgroups"
-                                (gnus-decode-newsgroups
-                                 (with-current-buffer
-                                     gnus-original-article-buffer
-                                   (nnmail-fetch-field "Newsgroups"))
-                                 gnus-newsgroup-name method)))
-      (when (nnmail-fetch-field "Followup-To")
-       (nnheader-replace-header "Followup-To"
-                                (gnus-decode-newsgroups
-                                 (with-current-buffer
-                                     gnus-original-article-buffer
-                                   (nnmail-fetch-field "Followup-To"))
-                                 gnus-newsgroup-name method))))))
+      (save-restriction
+       (goto-char (point-min))
+       (article-narrow-to-head)
+       (while (re-search-forward (concat "^\\(Newsgroups\\|Followup-To\\): "
+                                         "\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]")
+                                 nil t)
+         (replace-match (save-match-data
+                          (gnus-decode-newsgroups
+                           ;; XXX how to use data in this buffer?
+                           (with-current-buffer gnus-original-article-buffer
+                             (goto-char (point-min))
+                             (re-search-forward
+                              (concat "^\\(Newsgroups\\|Followup-To\\): "
+                                      "\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]")
+                              nil t)
+                             (match-string 2))
+                           gnus-newsgroup-name method))
+                        t t nil 2))))))
 
 (autoload 'idna-to-unicode "idna")