Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 806, 811-812, 823)

   - Merge from emacs--rel--22
   - Update from CVS

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

2007-07-24  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-msg.el (gnus-summary-supersede-article)
   (gnus-summary-resend-message-edit): Add Gcc header.
   (gnus-summary-resend-bounced-mail): Ditto; search whole body for parent
   article's Message-ID; refer parent article in summary buffer.

   * lisp/gnus/message.el (message-bounce): Call mime-to-mml.

2007-07-14  David Kastrup  <dak@gnu.org>

   * lisp/gnus/gnus-art.el (gnus-mime-delete-part): Don't go through article-edit
   finishing actions if we did not edit the article.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-82

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a39d64994b080e771db28f5c230b316258ee2857..83ca62ca0de17fb83a923d9c8d7e97c814b793ce 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2,6 +2,15 @@
 
        * Relicense all FSF files to GPLv3 or later.
 
+2007-07-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-msg.el (gnus-summary-supersede-article)
+       (gnus-summary-resend-message-edit): Add Gcc header.
+       (gnus-summary-resend-bounced-mail): Ditto; search whole body for parent
+       article's Message-ID; refer parent article in summary buffer.
+
+       * message.el (message-bounce): Call mime-to-mml.
+
 2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
@@ -11,6 +20,11 @@
 
        * gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.
 
+2007-07-14  David Kastrup  <dak@gnu.org>
+
+       * gnus-art.el (gnus-mime-delete-part): Don't go through article-edit
+       finishing actions if we did not edit the article.
+
 2007-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 2d5672ff78a906201b0ef09cbbd7f7248957f66f..40de10187f3556b85083a30712ef44e9bd62f918 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4408,11 +4408,11 @@ Deleting parts may malfunction or destroy the article; continue? ")
          (gnus-summary-edit-article-done
           ,(or (mail-header-references gnus-current-headers) "")
           ,(gnus-group-read-only-p)
-          ,gnus-summary-buffer no-highlight)))))
-  ;; Not in `gnus-mime-save-part-and-strip':
-  (gnus-article-edit-done)
-  (gnus-summary-expand-window)
-  (gnus-summary-show-article))
+          ,gnus-summary-buffer no-highlight))))
+    ;; Not in `gnus-mime-save-part-and-strip':
+    (gnus-article-edit-done)
+    (gnus-summary-expand-window)
+    (gnus-summary-show-article)))
 
 (defun gnus-mime-save-part ()
   "Save the MIME part under point."

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 0789e25bc68324c2ebb133e4a06bdb2cfcdf5c13..c9aedab70193d64dd57f523f0f8a09e2309b0aaf 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -815,7 +815,10 @@ header line with the old Message-ID."
               (set-buffer ,gnus-summary-buffer)
               (gnus-cache-possibly-remove-article ,article nil nil nil t)
               (gnus-summary-mark-as-read ,article gnus-canceled-mark)))))
-       message-send-actions))))
+       message-send-actions)
+      ;; Add Gcc header.
+      (gnus-inews-insert-archive-gcc)
+      (gnus-inews-insert-gcc))))
 
 \f
 
@@ -1280,10 +1283,13 @@ composing a new message."
        (message-narrow-to-head-1)
        ;; Gnus will generate a new one when sending.
        (message-remove-header "Message-ID")
-       (message-remove-header message-ignored-resent-headers t)
        ;; Remove unwanted headers.
+       (message-remove-header message-ignored-resent-headers t)
        (goto-char (point-max))
        (insert mail-header-separator)
+       ;; Add Gcc header.
+       (gnus-inews-insert-archive-gcc)
+       (gnus-inews-insert-gcc)
        (goto-char (point-min))
        (when (re-search-forward "^To:\\|^Newsgroups:" nil 'move)
          (forward-char 1))
@@ -1557,15 +1563,29 @@ If FETCH, try to fetch the article that this is a reply to, if indeed
 this is a reply."
   (interactive "P")
   (gnus-summary-select-article t)
-  (set-buffer gnus-original-article-buffer)
-  (gnus-setup-message 'compose-bounce
-    (let* ((references (mail-fetch-field "references"))
-          (parent (and references (gnus-parent-id references))))
+  (let (summary-buffer parent)
+    (if fetch
+       (progn
+         (setq summary-buffer (current-buffer))
+         (set-buffer gnus-original-article-buffer)
+         (article-goto-body)
+         (when (re-search-forward "^References:\n?" nil t)
+           (while (memq (char-after) '(?\t ? ))
+             (forward-line 1))
+           (skip-chars-backward "\t\n ")
+           (setq parent
+                 (gnus-parent-id (buffer-substring (match-end 0) (point))))))
+      (set-buffer gnus-original-article-buffer))
+    (gnus-setup-message 'compose-bounce
       (message-bounce)
+      ;; Add Gcc header.
+      (gnus-inews-insert-archive-gcc)
+      (gnus-inews-insert-gcc)
       ;; If there are references, we fetch the article we answered to.
-      (and fetch parent
-          (gnus-summary-refer-article parent)
-          (gnus-summary-show-all-headers)))))
+      (when parent
+       (with-current-buffer summary-buffer
+         (gnus-summary-refer-article parent)
+         (gnus-summary-show-all-headers))))))
 
 ;;; Gcc handling.
 

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index b98c4eb5366820eeeb444ec25779d185fc3302c9..419fd07727cb8092bc9c246e5664f62828aea875 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6697,7 +6697,7 @@ you."
        (goto-char boundary)
        (when (re-search-backward "^.?From .*\n" nil t)
          (delete-region (match-beginning 0) (match-end 0)))))
-    (mm-enable-multibyte)
+    (mime-to-mml)
     (save-restriction
       (message-narrow-to-head-1)
       (message-remove-header message-ignored-bounced-headers t)

diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi
index 5cf17e7d54b81fcb8a723860925c50cba0e8a5fd..0f3c141c792e177afba753ccd477b11c2dae269a 100644 (file)
--- a/man/emacs-mime.texi
+++ b/man/emacs-mime.texi
@@ -32,6 +32,7 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
+@c Node ``Interface Functions'' uses Latin-1 characters
 @documentencoding ISO-8859-1
 
 @dircategory Emacs