summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-14 06:28:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-14 06:28:32 +0000
commit1bf94da4f866bece424bb99f0caaf20756138926 (patch)
tree3959cae11e250b95783ca8abdab29dd4806b66ae
parent57a2457d135a759dc0f376283166feeeb54eb56c (diff)
* transcode.c (str_encode): about the extension of :fallback
option since 1.9.3. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--transcode.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d1e44077e..184e256caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 14 15:28:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * transcode.c (str_encode): about the extension of :fallback
+ option since 1.9.3.
+
Tue Oct 4 06:43:47 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych.rb: update psych version.
diff --git a/transcode.c b/transcode.c
index ea6439d573..4d9462fca6 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2842,7 +2842,9 @@ static VALUE encoded_dup(VALUE newstr, VALUE str, int encidx);
* Sets the replacement string to the given value. The default replacement
* string is "\uFFFD" for Unicode encoding forms, and "?" otherwise.
* :fallback ::
- * Sets the replacement string by the given hash for undefined character.
+ * Sets the replacement string by the given object for undefined
+ * character. The object should be a Hash, a Proc, a Method, or an
+ * object which has [] method.
* Its key is an undefined character encoded in the source encoding
* of current transcoder. Its value can be any encoding until it
* can be converted into the destination encoding of the transcoder.