Merge remote-tracking branch 'savannah/master' into native-comp

1 files changed, 1 insertions, 9 deletions

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 45455d897f3..bcede9c6ed1 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -256,15 +256,6 @@ 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.
@@ -276,6 +267,7 @@ nontrivial changes to the build process.
         lisp/language/tibetan.el
         lisp/leim/quail/ethiopic.el
         lisp/leim/quail/tibetan.el
+        lisp/international/titdic-cnv.el
 
  * binary files