[Emacs-diffs] Changes to emacs/lisp/gnus/utf7.el,v

[Reiner Steib]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Reiner Steib <rsteib>   07/11/20 21:06:35

Index: utf7.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/utf7.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- utf7.el     26 Jul 2007 05:27:06 -0000      1.12
+++ utf7.el     20 Nov 2007 21:06:34 -0000      1.13
@@ -209,20 +209,26 @@
 
 (defun utf7-encode (string &optional for-imap)
   "Encode UTF-7 STRING.  Use IMAP modification if FOR-IMAP is non-nil."
+  (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))))
+       (buffer-string)))))
 
 (defun utf7-decode (string &optional for-imap)
   "Decode UTF-7 STRING.  Use IMAP modification if FOR-IMAP is non-nil."
+  (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))))
+       (buffer-string)))))
 
 (provide 'utf7)