aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.7
diff options
context:
space:
mode:
authorEli Zaretskii2010-03-28 09:04:11 -0400
committerEli Zaretskii2010-03-28 09:04:11 -0400
commite7dbdb6dfc3ffdc25f8d32a43683500f596d9784 (patch)
treee7e73d34fe234175f7da59690ec5abf6f73b89a7 /src/ChangeLog.7
parent34689d3c1ad54fd463d5f20c64bb1ac655dc5741 (diff)
parent22ef1944028e9ac89a9717439b175ce3230a4ba1 (diff)
downloademacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.tar.gz
emacs-e7dbdb6dfc3ffdc25f8d32a43683500f596d9784.zip
Merge from mainline.
Diffstat (limited to 'src/ChangeLog.7')
-rw-r--r--src/ChangeLog.74
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 30ac527215f..6cc3d0f9e3e 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -7154,9 +7154,9 @@
7154 (ENCODE_ISO_CHARACTER): Bug of handling return value of unify_char 7154 (ENCODE_ISO_CHARACTER): Bug of handling return value of unify_char
7155 fixed. 7155 fixed.
7156 (DECODE_SJIS_BIG5_CHARACTER): New macro. 7156 (DECODE_SJIS_BIG5_CHARACTER): New macro.
7157 (decode_coding_sjis_big5): Handle character unificatoin table. 7157 (decode_coding_sjis_big5): Handle character unification table.
7158 Use macro DECODE_SJIS_BIG5_CHARACTER. 7158 Use macro DECODE_SJIS_BIG5_CHARACTER.
7159 (encode_coding_sjis_big5): Handle character unificatoin table. 7159 (encode_coding_sjis_big5): Handle character unification table.
7160 Use macro ENCODE_SJIS_BIG5_CHARACTER. 7160 Use macro ENCODE_SJIS_BIG5_CHARACTER.
7161 (setup_coding_system): Handle members 7161 (setup_coding_system): Handle members
7162 character_unification_table_for_decode and 7162 character_unification_table_for_decode and