(article-decode-group-name): Be correct instead of

smart.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7988961..7cc5fb1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-27  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-art.el (article-decode-group-name): Be correct instead of
+       smart.
+
 2003-03-27  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lpath.el: Bind url-current-object for FSF Emacs; bind
@@ -18,11 +23,11 @@
        * gnus-sum.el (gnus-summary-find-for-reselect): Renamed from
        gnus-summary-find-uncancelled, skip temporary articles inserted by
        "refer" functions.
-       
+
 2003-03-26  Vasily Korytov  <deskpot@myrealbox.com>
 
        * smiley.el (smiley-buffer): New function.
-       
+
 2003-03-26  Kevin Greiner <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-agent-fetch-selected-article): Replaced
@@ -30,14 +35,14 @@
        gnus-summary-update-download-mark (which updates the article's
        face by calling gnus-summary-update-line AND updates the download
        mark to show that the article was fetched).
-       
+
 2003-03-23  Kevin Greiner <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Provides
        option of deleting agent directories for groups/servers that are
        not currently agentized.
        (gnus-agent-expire): Use gnus-agent-expire-unagentized-dirs.
-       
+
        * gnus-int.el (gnus-open-server): Report backend errors in
        condition handler.
 

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