Merge

1 files changed, 9 insertions, 1 deletions

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 6cb1b764c51..1e418590a68 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -256,11 +256,19 @@ nontrivial changes to the build process.
 
         etc/tutorials/TUTORIAL.ja
 
+ * iso-2022-7bit
+
+     This file contains multiple Chinese charsets, and converting it
+     to UTF-8 would lose the charset property and would change the
+     code's behavior.  Although this could be worked around by
+     propertizing the strings, that hasn't been done.
+
+        lisp/international/titdic-cnv.el
+
  * utf-8-emacs
 
      These files contain characters that cannot be encoded in UTF-8.
 
-        lisp/international/titdic-cnv.el
         lisp/language/ethio-util.el
         lisp/language/ethiopic.el
         lisp/language/ind-util.el