Synch to No Gnus 200603231425.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 005a0c9..d7726e5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2006-03-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mml.el (mml-insert-mime): Ignore cached contents of
+       message/external-body part.
+
+       * mm-decode.el (mm-get-part): Add optional 'no-cache' argument.
+       (mm-insert-part): Ditto.
+
+2006-03-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * pgg-gpg.el (pgg-gpg-update-agent): Only use make-network-process
+       if we can.
+
 2006-03-22  Sascha Wilde  <wilde@sha-bang.de>
 
        * pgg-gpg.el (pgg-gpg-use-agent): Disable by default.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index bf910e9..7af9bef 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1097,9 +1097,12 @@ external if displayed external."
 (put 'mm-with-part 'lisp-indent-function 1)
 (put 'mm-with-part 'edebug-form-spec '(body))
 
-(defun mm-get-part (handle)
-  "Return the contents of HANDLE as a string."
-  (if (equal (mm-handle-media-type handle) "message/external-body")
+(defun mm-get-part (handle &optional no-cache)
+  "Return the contents of HANDLE as a string.
+If NO-CACHE is non-nil, cached contents of a message/external-body part
+are ignored."
+  (if (and (not no-cache)
+          (equal (mm-handle-media-type handle) "message/external-body"))
       (progn
        (unless (mm-handle-cache handle)
          (mm-extern-cache-contents handle))
@@ -1108,8 +1111,10 @@ external if displayed external."
     (mm-with-part handle
       (buffer-string))))
 
-(defun mm-insert-part (handle)
-  "Insert the contents of HANDLE in the current buffer."
+(defun mm-insert-part (handle &optional no-cache)
+  "Insert the contents of HANDLE in the current buffer.
+If NO-CACHE is non-nil, cached contents of a message/external-body part
+are ignored."
   (save-excursion
     (insert
      (cond ((eq (mail-content-type-get (mm-handle-type handle) 'charset)
@@ -1117,9 +1122,9 @@ external if displayed external."
            (with-current-buffer (mm-handle-buffer handle)
              (buffer-string)))
           ((mm-multibyte-p)
-           (mm-string-as-multibyte (mm-get-part handle)))
+           (mm-string-as-multibyte (mm-get-part handle no-cache)))
           (t
-           (mm-get-part handle))))))
+           (mm-get-part handle no-cache))))))
 
 (defun mm-file-name-delete-whitespace (file-name)
   "Remove all whitespace characters from FILE-NAME."

diff --git a/lisp/mml.el b/lisp/mml.el
index 57ec619..359e33b 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -804,7 +804,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
       (unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
        (save-excursion
          (set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
-         (mm-insert-part handle)
+         (mm-insert-part handle 'no-cache)
          (if (setq mmlp (equal (mm-handle-media-type handle)
                                "message/rfc822"))
              (mime-to-mml)))))