Delete the definition of utf-7.

(utf-7-post-read-conversion, utf-7-pre-write-conversion): Add
autoload cookies.

1 files changed, 9 insertions, 16 deletions

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 6340dafc12a..92504967340 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -36,22 +36,13 @@
 
 ;;; Code:
 
-(make-coding-system
- 'utf-7 0 ?U
- "UTF-7 encoding of Unicode (RFC 2152)"
- nil
- `((safe-chars . ,(coding-system-get 'utf-16be 'safe-chars))
-   (mime-charset . utf-7)
-   (pre-write-conversion . utf-7-pre-write-conversion)
-   (post-read-conversion . utf-7-post-read-conversion)))
-
-;; (make-coding-system
-;;  'utf-7-imap 0 ?u
-;;  "UTF-7 encoding of Unicode, IMAP version (RFC 2060)"
-;;  nil
-;;  `((safe-chars . ,(coding-system-get 'utf-16be 'safe-chars))
-;;    (pre-write-conversion . utf-7-imap-pre-write-conversion)
-;;    (post-read-conversion . utf-7-imap-post-read-conversion)))
+;; (define-coding-system 'utf-7-imap
+;;   "UTF-7 encoding of Unicode, IMAP version (RFC 2060)"
+;;   :coding-type 'utf-8
+;;   :mnemonic ?u
+;;   :charset-list '(unicode)
+;;   :pre-write-conversion 'utf-7-imap-pre-write-conversion
+;;   :post-read-conversion 'utf-7-imap-post-read-conversion)
 
 (defun utf-7-decode (len imap)
   "Decode LEN bytes of UTF-7 at point.
@@ -81,6 +72,7 @@ IMAP non-nil means use the IMAP version."
 		  (delete-backward-char 1)))))))
       (- (point-max) (point-min)))))
 
+;;;###autoload
 (defun utf-7-post-read-conversion (len)
   (utf-7-decode len nil))
 
@@ -129,6 +121,7 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
 	    (insert ?-)))))
     nil))
 
+;;;###autoload
 (defun utf-7-pre-write-conversion (from to)
   (utf-7-encode from to nil))