summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/syck/rubyext.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e27c12dad..9a6fe6f78a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 18:40:35 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/syck/rubyext.c (yaml_org_handler): associate encoding.
+
+ * ext/syck/rubyext.c (syck_genericresolver_node_import): ditto.
+
Sun Jun 15 18:17:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_core.h (rb_vm_t), vm.c (rb_vm_mark): moved preallocated special
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index b1b8a5c12e..fff3cf2818 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -511,6 +511,7 @@ yaml_org_handler( SyckNode *n, VALUE *ref )
else if ( strcmp( type_id, "str" ) == 0 )
{
obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+ rb_enc_associate(obj, rb_utf8_encoding());
}
else
{
@@ -1237,6 +1238,7 @@ syck_genericresolver_node_import(VALUE self, VALUE node)
case syck_str_kind:
{
v = rb_str_new( n->data.str->ptr, n->data.str->len );
+ rb_enc_associate(v, rb_utf8_encoding());
if ( n->data.str->style == scalar_1quote )
{
style = sym_1quote;