summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--admin/ChangeLog2
-rw-r--r--admin/notes/unicode28
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/x-win.el7
4 files changed, 38 insertions, 3 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 891baa69564..8b71b065056 100644
--- 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 0cc31c748d7..53d568dd628 100644
--- 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 c3dc0bfaa87..019ea722be8 100644
--- 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 63ef2b402b0..84d6ddbf46c 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -427,7 +427,9 @@ as returned by `x-server-vendor'."
(#x3fe . ?,D~(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 "(J~(B" (i.e., bytes "ESC ( J ~ ESC ( B") to "$(G"#(B" (i.e., bytes
+ ;; "ESC $ ( G " # ESC ( B").
(#x47e . ?(J~(B)
(#x4a1 . ?$A!#(B)
(#x4a2 . ?\$A!8(B)
@@ -1127,6 +1129,9 @@ as returned by `x-server-vendor'."
(#x20a8 . ?$,1tH(B)
(#x20aa . ?$,1tJ(B)
(#x20ab . ?$,1tK(B)
+ ;; Kana: Fixme: needs checking. Using Emacs to convert this to Unicode
+ ;; and back changes this from ",b$(B" (i.e., bytes "ESC , b $ ESC ( B") to
+ ;; ",F$(B" (i.e., bytes "ESC , F $ ESC ( B").
(#x20ac . ?,b$(B)))
(puthash (car pair) (cdr pair) x-keysym-table))