Adjusted for the name change: xxx-utf-16-{le,be} -> xxx-utf-16{le,be}.

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 1e0637b91890ce00489b11afad74703cae685c5d..04bc47d3de2e3889b5d58a1df064d5de8123e06c 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -520,8 +520,8 @@ for decoding and encoding files, process I/O, etc."
       coding-category-iso-8-else       'iso-2022-8bit-ss2
       coding-category-ccl              nil
       coding-category-utf-8            'mule-utf-8
-      coding-category-utf-16-be         'mule-utf-16-be-with-signature
-      coding-category-utf-16-le         'mule-utf-16-le-with-signature
+      coding-category-utf-16-be         'mule-utf-16be-with-signature
+      coding-category-utf-16-le         'mule-utf-16le-with-signature
       coding-category-big5             'chinese-big5
       coding-category-raw-text         'raw-text
       coding-category-binary           'no-conversion)

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 4e453c4145d0ad161b582c7bfc70fe32c57141f3..842d81c92a15f09913e684246bdf7eee08f8d012 100644 (file)
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -40,7 +40,7 @@
  'utf-7 0 ?U
  "UTF-7 encoding of Unicode (RFC 2152)"
  nil
- `((safe-chars . ,(coding-system-get 'utf-16-be 'safe-chars))
+ `((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)))
@@ -49,7 +49,7 @@
 ;;  'utf-7-imap 0 ?u
 ;;  "UTF-7 encoding of Unicode, IMAP version (RFC 2060)"
 ;;  nil
-;;  `((safe-chars . ,(coding-system-get 'utf-16-be 'safe-chars))
+;;  `((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)))
 
@@ -75,7 +75,7 @@ IMAP non-nil means use the IMAP version."
                  (if imap
                      (subst-char-in-region p (point) ?, ?/))
                  (base64-decode-region p (point)))
-               (decode-coding-region p (point) 'utf-16-be)
+               (decode-coding-region p (point) 'utf-16be)
                (save-excursion
                  (goto-char p)
                  (delete-backward-char 1)))))))
@@ -116,7 +116,7 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
            (save-restriction
              ;; encode-coding-region doesn't preserve point
              (narrow-to-region p (point))
-             (encode-coding-region p (point-max) 'utf-16-be)
+             (encode-coding-region p (point-max) 'utf-16be)
              (base64-encode-region p (point-max))
              (if imap
                  (subst-char-in-region p (point-max) ?/ ?,))