(utf-16-le): Renamed from utf-16-le-nosig.

(utf-16-be): Renamed from utf-16-be-nosig.
(utf-16-le-with-sig): Renamed from utf-16-le.
(utf-16-be-with-sig): Renamed from utf-16-be.
(utf-16): Set :bom to (utf-16-le-with-sig . utf-16-be-with-sig).

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 3fe219977366ef87df61e93ed5ec7abb4f7fd91e..92653c1e9c85ce77824e428c0d62cd8d02e3116f 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1163,44 +1163,47 @@ is treated as a character."
   :mnemonic ?U
   :charset-list '(emacs))
 
-(define-coding-system 'utf-16
-  "UTF-16"
-  :coding-type 'utf-16
-  :mnemonic ?U
-  :charset-list '(unicode)
-  :mime-charset 'utf-16)
-
-(define-coding-system 'utf-16-le-nosig
-  "UTF-16, little endian, no signature."
+(define-coding-system 'utf-16-le
+  "UTF-16, little endian."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
-  :endian 'little)
+  :endian 'little
+  :mime-charset 'utf-16le)
 
-(define-coding-system 'utf-16-be-nosig
-  "UTF-16, big endian, no signature."
+(define-coding-system 'utf-16-be
+  "UTF-16, big endian."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
-  :endian 'big)
+  :endian 'big
+  :mime-charset 'utf-16be)
 
-(define-coding-system 'utf-16-le
+(define-coding-system 'utf-16-le-with-sig
   "UTF-16, little endian, with signature."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
   :bom t
   :endian 'little
-  :mime-charset 'utf-16-le)
+  :mime-charset 'utf-16)
 
-(define-coding-system 'utf-16-be
+(define-coding-system 'utf-16-be-with-sig
   "UTF-16, big endian, with signature."
   :coding-type 'utf-16
   :mnemonic ?U
   :charset-list '(unicode)
   :bom t
   :endian 'big
-  :mime-charset 'utf-16-be)
+  :mime-charset 'utf-16)
+
+(define-coding-system 'utf-16
+  "UTF-16"
+  :coding-type 'utf-16
+  :mnemonic ?U
+  :charset-list '(unicode)
+  :bom '(utf-16-le-with-sig . utf-16-be-with-sig)
+  :mime-charset 'utf-16)
 
 (define-coding-system 'iso-2022-7bit
   "ISO 2022 based 7-bit encoding using only G0."