iso-2022-7bit commentary fixes

* notes/unicode: Mention some more iso-2022-7bit files.
* lisp/term/x-win.el (x-keysym-pair): Add a Fixme.

Fixes: debbugs:13936

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 891baa695647de3b33ff3dee756edff8826019ea..8b71b065056d100f58263963b893fb3d9efd7f10 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,7 @@
 2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * notes/unicode: Mention some more iso-2022-7bit files (Bug#13936).
+
        Automate the build of ja-dic.el (Bug#13984).
        * notes/unicode: ja-dic.el is now UTF-8.
 

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 0cc31c748d7c580f911a69e816452eb9f4f8f252..53d568dd62852e044eea76cf49f1ae33247bf232 100644 (file)
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -190,11 +190,35 @@ 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
+       etc/tutorials/TUTORIAL.ko
+       leim/quail/cyril-jis.el
+       leim/quail/hanja-jis.el
+       leim/quail/hanja.el
+       leim/quail/hanja3.el
+       leim/quail/japanese.el
+       leim/quail/py-punct.el
+       leim/quail/pypunct-b5.el
+       leim/quail/symbol-ksc.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
+
      These files contain characters that cannot be encoded in UTF-8.
 
        leim/quail/tibetan.el

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3dc0bfaa87d7ca17ca586dd2e50413e57172a1c..019ea722be8638397ce83781ee7430c1e899c909 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * term/x-win.el (x-keysym-pair): Add a Fixme (Bug#13936).
+
 2013-03-18  Jan Djärv  <jan.h.d@swipnet.se>
 
        * mouse.el (mouse-on-link-p): Check for scroll bar (Bug#13979).

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 63ef2b402b0f2726be9faab34cd636a55f0c312f..84d6ddbf46c1a4d62996d5e253830934c806a366 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -427,7 +427,9 @@ as returned by `x-server-vendor'."
        (#x3fe . ?\e,D~\e(B)
        ;; Kana: Fixme: needs conversion to Japanese charset -- seems
        ;; to require jisx0213, for which the Unicode translation
-       ;; isn't clear.
+       ;; isn't clear.  Using Emacs to convert this to Unicode and back changes
+       ;; this from "\e(J~\e(B" (i.e., bytes "ESC ( J ~ ESC ( B") to "\e$(G"#\e(B" (i.e., bytes
+       ;; "ESC $ ( G " # ESC ( B").
        (#x47e . ?\e(J~\e(B)
        (#x4a1 . ?\e$A!#\e(B)
        (#x4a2 . ?\\e$A!8\e(B)
@@ -1127,6 +1129,9 @@ as returned by `x-server-vendor'."
        (#x20a8 . ?\e$,1tH\e(B)
        (#x20aa . ?\e$,1tJ\e(B)
        (#x20ab . ?\e$,1tK\e(B)
+       ;; Kana: Fixme: needs checking.  Using Emacs to convert this to Unicode
+       ;; and back changes this from "\e,b$\e(B" (i.e., bytes "ESC , b $ ESC ( B") to
+       ;; "\e,F$\e(B" (i.e., bytes "ESC , F $ ESC ( B").
        (#x20ac . ?\e,b$\e(B)))
   (puthash (car pair) (cdr pair) x-keysym-table))