Sync up with gnus-6_10.

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 76f48d6..c37bcc0 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -6,7 +6,6 @@
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;     Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
 ;;      Katsumi Yamaoka  <yamaoka@jpl.org>
-;;     Kiyokazu SUTO    <suto@merry.xmath.ous.ac.jp>
 ;; Keywords: mail, news, MIME
 
 ;; This file is part of GNU Emacs.
@@ -308,42 +307,6 @@ If prefix argument YANK is non-nil, original article is yanked automatically."
   (interactive "P")
   (gnus-summary-followup (gnus-summary-work-articles arg) t))
 
-(defun gnus-summary-gather-references (articles)
-  (and articles
-  (let ((tbuf (gnus-get-buffer-create " *gnus-summary-gather-references*"))
-       refs ref article i)
-    (save-excursion
-      (set-buffer tbuf)
-      (erase-buffer)
-      (while (setq article (pop articles))
-       (save-window-excursion
-         (set-buffer gnus-summary-buffer)
-         (gnus-summary-select-article nil nil nil article)
-         (gnus-summary-remove-process-mark article))
-       (gnus-copy-article-buffer)
-       (set-buffer gnus-article-copy)
-       (save-restriction
-         (message-narrow-to-head)
-         (setq refs (if articles
-                        (concat (message-fetch-field "references")
-                                (message-fetch-field "message-id"))
-                      (message-fetch-field "references"))
-               i 0)
-         (widen)
-         (if refs
-             (progn (set-buffer tbuf)
-                    (while (string-match "<[^>]+>" refs i)
-                      (setq i (match-end 0)
-                            ref (substring refs (match-beginning 0) i))
-                      (goto-char (point-max))
-                      (unless (search-backward ref (point-min) t)
-                        (insert " " ref)))))))
-      (set-buffer tbuf)
-      (goto-char (point-min))
-      (if (looking-at "\\s +")
-       (goto-char (match-end 0)))
-          (buffer-substring (point) (point-max))))))
-
 (defun gnus-inews-yank-articles (articles)
   (let (beg article)
     (message-goto-body)
@@ -486,8 +449,7 @@ header line with the old Message-ID."
                (message-news (or to-group group))
              (set-buffer gnus-article-copy)
              (gnus-msg-treat-broken-reply-to)
-             (message-followup (if (or newsgroup-p force-news) nil to-group)
-                               (gnus-summary-gather-references yank)))
+             (message-followup (if (or newsgroup-p force-news) nil to-group)))
          ;; The is mail.
          (if post
              (progn
@@ -501,7 +463,7 @@ header line with the old Message-ID."
                        message-send-actions)))
            (set-buffer gnus-article-copy)
            (gnus-msg-treat-broken-reply-to)
-           (message-wide-reply to-address (gnus-summary-gather-references yank))))
+           (message-wide-reply to-address)))
        (when yank
          (gnus-inews-yank-articles yank))))))
 
@@ -651,7 +613,7 @@ automatically."
       (gnus-summary-select-article)
       (set-buffer (gnus-copy-article-buffer))
       (gnus-msg-treat-broken-reply-to)
-      (message-reply nil wide (gnus-summary-gather-references yank))
+      (message-reply nil wide)
       (when yank
        (gnus-inews-yank-articles yank)))))
 

diff --git a/lisp/message.el b/lisp/message.el
index e9171ac..53e78ac 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6,7 +6,6 @@
 ;;         Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
 ;;         Keiichi Suzuki   <kei-suzu@mail.wbs.ne.jp>
 ;;         Katsumi Yamaoka  <yamaoka@jpl.org>
-;;         Kiyokazu SUTO    <suto@merry.xmath.ous.ac.jp>
 ;; Keywords: mail, news, MIME
 
 ;; This file is part of GNU Emacs.
@@ -3640,12 +3639,12 @@ OTHER-HEADERS is an alist of header/value pairs."
                     (Subject . ,(or subject ""))))))
 
 ;;;###autoload
-(defun message-reply (&optional to-address wide references)
+(defun message-reply (&optional to-address wide)
   "Start editing a reply to the article in the current buffer."
   (interactive)
   (let ((cur (current-buffer))
        from subject date reply-to to cc
-       message-id follow-to
+       references message-id follow-to
        (inhibit-point-motion-hooks t)
        mct never-mct gnus-warning)
     (save-restriction
@@ -3668,7 +3667,7 @@ OTHER-HEADERS is an alist of header/value pairs."
            cc (message-fetch-field "cc")
            mct (message-fetch-field "mail-copies-to")
            reply-to (message-fetch-field "reply-to")
-           references (or references (message-fetch-field "references"))
+           references (message-fetch-field "references")
            message-id (message-fetch-field "message-id" t))
       ;; Remove any (buggy) Re:'s that are present and make a
       ;; proper one.
@@ -3748,19 +3747,19 @@ OTHER-HEADERS is an alist of header/value pairs."
      cur)))
 
 ;;;###autoload
-(defun message-wide-reply (&optional to-address references)
+(defun message-wide-reply (&optional to-address)
   "Make a \"wide\" reply to the message in the current buffer."
   (interactive)
-  (message-reply to-address t references))
+  (message-reply to-address t))
 
 ;;;###autoload
-(defun message-followup (&optional to-newsgroups references)
+(defun message-followup (&optional to-newsgroups)
   "Follow up to the message in the current buffer.
 If TO-NEWSGROUPS, use that as the new Newsgroups line."
   (interactive)
   (let ((cur (current-buffer))
        from subject date reply-to mct
-       message-id follow-to
+       references message-id follow-to
        (inhibit-point-motion-hooks t)
        (message-this-is-news t)
        followup-to distribution newsgroups gnus-warning posted-to)
@@ -3776,7 +3775,7 @@ If TO-NEWSGROUPS, use that as the new Newsgroups line."
       (setq from (message-fetch-field "from")
            date (message-fetch-field "date")
            subject (or (message-fetch-field "subject") "none")
-           references (or references (message-fetch-field "references"))
+           references (message-fetch-field "references")
            message-id (message-fetch-field "message-id" t)
            followup-to (message-fetch-field "followup-to")
            newsgroups (message-fetch-field "newsgroups")