summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--transcode.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1266100d0e..6d60af0e7e 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.
+
Wed Dec 14 12:19:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* load.c (load_unlock): release loading barrier and then remove it
diff --git a/transcode.c b/transcode.c
index 15d9f5c238..0178ce7f7f 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2828,7 +2828,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.