(utf-16le, utf-16be-16be)

(utf-16le-with-signature, utf-16be-with-signature, utf-16):
Define :mime-text-unsuitable.  `utf-16{b,l}e...' renamed from
`-16-{b,l}e-' and aliases defined for the old names.

1 files changed, 17 insertions, 5 deletions

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 197c0e60e0b..3c6b247dca2 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1165,38 +1165,42 @@ is treated as a character."
   :mnemonic ?U
   :charset-list '(emacs))
 
-(define-coding-system 'utf-16-le
+(define-coding-system 'utf-16le
   "UTF-16, little endian."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
   :endian 'little
+  :mime-text-unsuitable t
   :mime-charset 'utf-16le)
 
-(define-coding-system 'utf-16-be
+(define-coding-system 'utf-16be
   "UTF-16, big endian."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
   :endian 'big
+  :mime-text-unsuitable t
   :mime-charset 'utf-16be)
 
-(define-coding-system 'utf-16-le-with-signature
+(define-coding-system 'utf-16le-with-signature
   "UTF-16, little endian, with signature."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
   :bom t
   :endian 'little
+  :mime-text-unsuitable t
   :mime-charset 'utf-16)
 
-(define-coding-system 'utf-16-be-with-signature
+(define-coding-system 'utf-16be-with-signature
   "UTF-16, big endian, with signature."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
   :bom t
   :endian 'big
+  :mime-text-unsuitable t
   :mime-charset 'utf-16)
 
 (define-coding-system 'utf-16
@@ -1204,10 +1208,18 @@ is treated as a character."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
-  :bom '(utf-16-le-with-signature . utf-16-be-with-signature)
+  :bom '(utf-16le-with-signature . utf-16be-with-signature)
   :endian 'big
+  :mime-text-unsuitable t
   :mime-charset 'utf-16)
 
+;; Backwards compatibility (old names, also used by Mule-UCS).  We
+;; prefer the MIME names.
+(define-coding-system-alias 'utf-16-le 'utf-16le)
+(define-coding-system-alias 'utf-16-be 'utf-16be)
+(define-coding-system-alias 'utf-16-le-with-signature 'utf-16le-with-signature)
+(define-coding-system-alias 'utf-16-be-with-signature 'utf-16be-with-signature)
+
 (define-coding-system 'iso-2022-7bit
   "ISO 2022 based 7-bit encoding using only G0."
   :coding-type 'iso-2022