diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-05 17:56:55 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-05 17:56:55 +0000 |
| commit | fce00b2422f53681f827335f384b4f053342f93d (patch) | |
| tree | f33e19c4ea26053bd4dae7a23ce193768179cca8 | |
| parent | 09e9807a8972353040e7b9933bd8e8cd35b11eb5 (diff) | |
merge revision(s) 28103:
* encoding.c (rb_enc_unicode_p): check the encoding is Unicode
or not by the name; not function's pointer. [ruby-dev:41479]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 3 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Jun 6 02:56:42 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c (rb_enc_unicode_p): check the encoding is Unicode + or not by the name; not function's pointer. [ruby-dev:41479] + Sat Jun 5 23:15:42 2010 NARUSE, Yui <naruse@ruby-lang.org> * re.c (rb_reg_expr_str): ASCII incompatible strings diff --git a/encoding.c b/encoding.c index 83607d5103..a7950a8251 100644 --- a/encoding.c +++ b/encoding.c @@ -420,7 +420,8 @@ enc_ascii_compatible_p(VALUE enc) int rb_enc_unicode_p(rb_encoding *enc) { - return rb_utf8_encoding()->is_code_ctype == enc->is_code_ctype; + const char *name = rb_enc_name(enc); + return name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7'; } static const char * @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-06-05" +#define RUBY_RELEASE_DATE "2010-06-06" #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -7,7 +7,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 6 #include "ruby/version.h" |