mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
(utf7-encode, utf7-decode): Use coding system
`utf-7'/`utf-7-imap' from utf-7.el' if available.
This commit is contained in:
parent
2ea6167b2d
commit
f21470efb6
@ -1,5 +1,8 @@
|
||||
2007-11-20 Reiner Steib <Reiner.Steib@gmx.de>
|
||||
|
||||
* 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.
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user