Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-507

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 100)

   - Update from CVS

2005-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mml.el (mml-generate-mime-1): Make the content type default to
   text/plain if the filename is not specified.

2005-08-01  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-uu.el (gnus-uu-save-article): Use insert-buffer-substring
   instead of insert-buffer.

   * lisp/gnus/message.el (message-yank-original): Ditto; set the mark at the
   end of the yanked message.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6b25403e47b224355dc8bf96f17fef5a71352b42..a96013006c2be8e0d8110d1cd2efe7348a827062 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,16 @@
+2005-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mml.el (mml-generate-mime-1): Make the content type default to
+       text/plain if the filename is not specified.
+
+2005-08-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-uu.el (gnus-uu-save-article): Use insert-buffer-substring
+       instead of insert-buffer.
+
+       * message.el (message-yank-original): Ditto; set the mark at the
+       end of the yanked message.
+
 2005-07-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-next-page-1): Reduce the number of

diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 5bdd17f84c1af78d3b6c02dc366a45468e8f6fd2..4a7d5fec422c95e7f507066fd7cbf03e4023072e 100644 (file)
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -917,16 +917,16 @@ When called interactively, prompt for REGEXP."
        (if (and message-forward-as-mime gnus-uu-digest-buffer)
            (with-current-buffer gnus-uu-digest-buffer
              (erase-buffer)
-             (insert-buffer "*gnus-uu-pre*")
+             (insert-buffer-substring "*gnus-uu-pre*")
              (goto-char (point-max))
-             (insert-buffer "*gnus-uu-body*"))
+             (insert-buffer-substring "*gnus-uu-body*"))
          (save-excursion
            (set-buffer "*gnus-uu-pre*")
            (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
            (if gnus-uu-digest-buffer
                (with-current-buffer gnus-uu-digest-buffer
                  (erase-buffer)
-                 (insert-buffer "*gnus-uu-pre*"))
+                 (insert-buffer-substring "*gnus-uu-pre*"))
              (let ((coding-system-for-write mm-text-coding-system))
                (gnus-write-buffer gnus-uu-saved-article-name))))
          (save-excursion
@@ -939,7 +939,7 @@ When called interactively, prompt for REGEXP."
            (if gnus-uu-digest-buffer
                (with-current-buffer gnus-uu-digest-buffer
                  (goto-char (point-max))
-                 (insert-buffer "*gnus-uu-body*"))
+                 (insert-buffer-substring "*gnus-uu-body*"))
              (let ((coding-system-for-write mm-text-coding-system)
                    (file-name-coding-system nnmail-pathname-coding-system))
                (write-region

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d509b703419889857f994e151bb5fa4f4834cf84..c5679e0a22f7c10a6bc0fe7abfe554bff1afbe84 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3206,7 +3206,9 @@ prefix, and don't delete any headers."
     (when (and message-reply-buffer
               message-cite-function)
       (delete-windows-on message-reply-buffer t)
-      (insert-buffer message-reply-buffer)
+      (push-mark (save-excursion
+                  (insert-buffer-substring message-reply-buffer)
+                  (point)))
       (unless arg
        (funcall message-cite-function))
       (message-exchange-point-and-mark)

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 57e2b54e73302981b6fc5f01a591e54151d6d6a5..4a3a568d34c20a44b83ced4d635b931cec72f5e4 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -409,8 +409,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
        (let* ((raw (cdr (assq 'raw cont)))
               (filename (cdr (assq 'filename cont)))
               (type (or (cdr (assq 'type cont))
-                        (and filename (mm-default-file-encoding filename))
-                        "application/octet-stream"))
+                        (if filename
+                            (or (mm-default-file-encoding filename)
+                                "application/octet-stream")
+                          "text/plain")))
               coded encoding charset flowed)
          (if (and (not raw)
                   (member (car (split-string type "/")) '("text" "message")))
@@ -533,8 +535,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
          (insert "\n\n")
          (insert "Content-Type: "
                  (or (cdr (assq 'type cont))
-                     (and name (mm-default-file-encoding name))
-                     "application/octet-stream")
+                     (if name
+                         (or (mm-default-file-encoding name)
+                             "application/octet-stream")
+                       "text/plain"))
                  "\n")
          (insert "Content-ID: " (message-make-message-id) "\n")
          (insert "Content-Transfer-Encoding: "