From f21470efb688f33c9313d641c9b16f4f5da3146b Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Tue, 20 Nov 2007 21:06:35 +0000 Subject: [PATCH] (utf7-encode, utf7-decode): Use coding system `utf-7'/`utf-7-imap' from utf-7.el' if available. --- lisp/gnus/ChangeLog | 3 +++ lisp/gnus/utf7.el | 28 +++++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index c67eece640a..dd8b059c55d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,8 @@ 2007-11-20 Reiner Steib + * utf7.el (utf7-encode, utf7-decode): Use coding system + `utf-7'/`utf-7-imap' from utf-7.el' if available. + * message.el (message-send-mail-function): New function. (message-send-mail-function): Set default using message-send-mail-function. Adjust doc string. diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el index dbe749cad69..deba6d131e4 100644 --- a/lisp/gnus/utf7.el +++ b/lisp/gnus/utf7.el @@ -209,20 +209,26 @@ Characters are in raw byte pairs in narrowed buffer." (defun utf7-encode (string &optional for-imap) "Encode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil." - (let ((default-enable-multibyte-characters t)) - (with-temp-buffer - (insert string) - (utf7-encode-internal for-imap) - (buffer-string)))) + (if (and (coding-system-p 'utf-7) (coding-system-p 'utf-7-imap)) + ;; Emacs 23 with proper support for IMAP + (encode-coding-string string (if for-imap 'utf-7-imap 'utf-7)) + (let ((default-enable-multibyte-characters t)) + (with-temp-buffer + (insert string) + (utf7-encode-internal for-imap) + (buffer-string))))) (defun utf7-decode (string &optional for-imap) "Decode UTF-7 STRING. Use IMAP modification if FOR-IMAP is non-nil." - (let ((default-enable-multibyte-characters nil)) - (with-temp-buffer - (insert string) - (utf7-decode-internal for-imap) - (mm-enable-multibyte) - (buffer-string)))) + (if (and (coding-system-p 'utf-7) (coding-system-p 'utf-7-imap)) + ;; Emacs 23 with proper support for IMAP + (decode-coding-string string (if for-imap 'utf-7-imap 'utf-7)) + (let ((default-enable-multibyte-characters nil)) + (with-temp-buffer + (insert string) + (utf7-decode-internal for-imap) + (mm-enable-multibyte) + (buffer-string))))) (provide 'utf7) -- 2.39.2