Mercurial > emacs
changeset 64712:4db92b217e85
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.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 02 Aug 2005 07:21:08 +0000 |
| parents | 5d202bf110c9 |
| children | fb0a0e5596b6 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-uu.el lisp/gnus/message.el lisp/gnus/mml.el |
| diffstat | 4 files changed, 28 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Aug 02 02:00:20 2005 +0000 +++ b/lisp/gnus/ChangeLog Tue Aug 02 07:21:08 2005 +0000 @@ -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
--- a/lisp/gnus/gnus-uu.el Tue Aug 02 02:00:20 2005 +0000 +++ b/lisp/gnus/gnus-uu.el Tue Aug 02 07:21:08 2005 +0000 @@ -917,16 +917,16 @@ (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 @@ (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
--- a/lisp/gnus/message.el Tue Aug 02 02:00:20 2005 +0000 +++ b/lisp/gnus/message.el Tue Aug 02 07:21:08 2005 +0000 @@ -3206,7 +3206,9 @@ (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)
--- a/lisp/gnus/mml.el Tue Aug 02 02:00:20 2005 +0000 +++ b/lisp/gnus/mml.el Tue Aug 02 07:21:08 2005 +0000 @@ -409,8 +409,10 @@ (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 @@ (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: "