merge from trunk; clean up some issues

1 files changed, 25 insertions, 5 deletions

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 7b5e21c864b..6db5bb7d05c 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -170,11 +170,9 @@ nontrivial changes to the build process.
  * japanese-iso-8bit
 
      SKK-JISYO.L is a verbatim copy of a file taken from an external source.
-     ja-dic.el is generated automatically by skkdic-convert; this process
-     hasn't been converted to use UTF-8.
+     It hasn't been converted to UTF-8.
 
         leim/SKK-DIC/SKK-JISYO.L
-        leim/ja-dic/ja-dic.el
 
  * japanese-shift-jis
 
@@ -192,11 +190,33 @@ nontrivial changes to the build process.
 
  * iso-2022-7bit
 
-     This file contains significant charset information, which is not
-     encoded in UTF-8.
+     This file switches between CJK charsets, which is not encoded in UTF-8.
 
         etc/HELLO
 
+     Each of these files contains just one CJK charset, but Emacs
+     currently has no easy way to specify set-charset-priority on a
+     per-file basis, so converting any of these files to UTF-8 might
+     change the file's appearance when viewed by an Emacs that is
+     operating in some other language environment.
+
+        etc/tutorials/TUTORIAL.ja
+        leim/quail/cyril-jis.el
+        leim/quail/hanja-jis.el
+        leim/quail/japanese.el
+        leim/quail/py-punct.el
+        leim/quail/pypunct-b5.el
+        lisp/international/ja-dic-cnv.el
+        lisp/international/ja-dic-utl.el
+        lisp/international/kinsoku.el
+        lisp/international/kkc.el
+        lisp/international/titdic-cnv.el
+        lisp/language/japan-util.el
+        lisp/language/japanese.el
+        lisp/term/x-win.el
+
+ * utf-8-emacs
+
      These files contain characters that cannot be encoded in UTF-8.
 
         leim/quail/tibetan.el