aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.7
diff options
context:
space:
mode:
authorStefan Monnier2010-03-24 14:02:56 -0400
committerStefan Monnier2010-03-24 14:02:56 -0400
commite867cb5d30200dd696b012e1ad0964d25c2a7ecc (patch)
tree3340026420f168909eaa734232e4890e15bc1626 /src/ChangeLog.7
parentb2b8574b8d03673f5673e2154d17c2cb80f59a0b (diff)
parentefee6a6d9cec2af824b8355c93d8f47b72a685a8 (diff)
downloademacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.tar.gz
emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.zip
Merge from `emacs-23'.
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