From 6f5c1a4f7caf54dd66a27b8fc2e12c18348c3d6b Mon Sep 17 00:00:00 2001 From: yoichi Date: Sat, 8 Jul 2006 01:06:39 +0000 Subject: [PATCH] Sync with flim-1_14 branch: 2006-06-15 Yoichi NAKAYAMA * smtp.el (smtp-submit-package): Ignore error in `smtp-primitive-quit' where SMTP mail transaction is completed. 2006-06-12 Hiroya Murata * mel-b-ccl.el (base64-ccl-insert-encoded-file): Use `insert-file-contents-as-binary' instead of `insert-file-contents'. * mel-q-ccl.el (quoted-printable-ccl-insert-encoded-file): Likewise. --- ChangeLog | 13 +++++++++++++ mel-b-ccl.el | 10 +++++++--- mel-q-ccl.el | 10 +++++++--- smtp.el | 4 +++- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72e1506..c2ee5fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-06-15 Yoichi NAKAYAMA + + * smtp.el (smtp-submit-package): Ignore error in + `smtp-primitive-quit' where SMTP mail transaction is completed. + +2006-06-12 Hiroya Murata + + * mel-b-ccl.el (base64-ccl-insert-encoded-file): Use + `insert-file-contents-as-binary' instead of `insert-file-contents'. + + * mel-q-ccl.el (quoted-printable-ccl-insert-encoded-file): + Likewise. + 2006-02-18 Hiroya Murata * smtp.el (smtp-debug): New user option. diff --git a/mel-b-ccl.el b/mel-b-ccl.el index 4a82772..69e178b 100644 --- a/mel-b-ccl.el +++ b/mel-b-ccl.el @@ -419,9 +419,13 @@ abcdefghijklmnopqrstuvwxyz\ (defun base64-ccl-insert-encoded-file (filename) "Encode contents of file FILENAME to base64, and insert the result." (interactive "*fInsert encoded file: ") - (let ((coding-system-for-read 'mel-ccl-base64-lf-rev) - format-alist) - (insert-file-contents filename))) + (insert + (decode-coding-string + (with-temp-buffer + (set-buffer-multibyte nil) + (insert-file-contents-as-binary filename) + (buffer-string)) + 'mel-ccl-base64-lf-rev))) (mel-define-method-function (mime-encode-string string (nil "base64")) 'base64-ccl-encode-string) diff --git a/mel-q-ccl.el b/mel-q-ccl.el index 3769fb9..cccacd8 100644 --- a/mel-q-ccl.el +++ b/mel-q-ccl.el @@ -898,9 +898,13 @@ abcdefghijklmnopqrstuvwxyz\ (defun quoted-printable-ccl-insert-encoded-file (filename) "Encode contents of the file named as FILENAME, and insert it." (interactive "*fInsert encoded file: ") - (let ((coding-system-for-read 'mel-ccl-quoted-printable-lf-lf-rev) - format-alist) - (insert-file-contents filename))) + (insert + (decode-coding-string + (with-temp-buffer + (set-buffer-multibyte nil) + (insert-file-contents-as-binary filename) + (buffer-string)) + 'mel-ccl-quoted-printable-lf-lf-rev))) (mel-define-method-function (mime-encode-string string (nil "quoted-printable")) diff --git a/smtp.el b/smtp.el index af9e404..0df5fa6 100644 --- a/smtp.el +++ b/smtp.el @@ -423,7 +423,9 @@ BUFFER may be a buffer or a buffer name which contains mail message." (smtp-primitive-data package)) (let ((connection (smtp-find-connection (current-buffer)))) (when (smtp-connection-opened connection) - (smtp-primitive-quit package) + (condition-case nil + (smtp-primitive-quit package) + (smtp-error)) (smtp-close-connection connection))))) (defun smtp-send-buffer-by-myself (sender recipients buffer) -- 1.7.10.4