master 6c3e65a75f5 1/2: Disambiguate mode line indication for utf-8 and utf-16

[Eli Zaretskii]

branch: master
commit 6c3e65a75f582ca007a7fbcc4b866680e3b0e626
Author: Ulrich Müller <ulm@gentoo.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Disambiguate mode line indication for utf-8 and utf-16
    
    * lisp/international/mule-conf.el (utf-7):
    * lisp/language/cyrillic.el (koi8-u): Change mnemonic letters to
    ?u and ?\N{cyrillic capital letter u}, respectively.
---
 lisp/international/mule-conf.el | 2 +-
 lisp/language/cyrillic.el       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index a27aaf9e522..f65f124b633 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1600,7 +1600,7 @@ for decoding and encoding files, process I/O, etc."
 (define-coding-system 'utf-7
   "UTF-7 encoding of Unicode (RFC 2152)."
   :coding-type 'utf-8
-  :mnemonic ?U
+  :mnemonic ?u
   :mime-charset 'utf-7
   :charset-list '(unicode)
   :pre-write-conversion 'utf-7-pre-write-conversion
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 7af87e65703..f923c84e221 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -126,7 +126,8 @@ Support for Russian using koi8-r and the russian-computer 
input method.")
 (define-coding-system 'koi8-u
   "KOI8-U 8-bit encoding for Cyrillic (MIME: KOI8-U)"
   :coding-type 'charset
-  :mnemonic ?U
+  ;; This used to be ?U which collided with UTF-8.
+  :mnemonic ?\N{cyrillic capital letter u} ; У
   :charset-list '(koi8-u)
   :mime-charset 'koi8-u)