diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-05-07 08:32:01 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-05-07 08:32:01 +0000 |
commit | 253581c432a4d2dccfe9f12102bafd9d8cc12c5a (patch) | |
tree | 016a66d71e79c14d451ff959a13be28f37883749 | |
parent | d303a22fccd1ce4bc59e3c98862ee4a87b4715b3 (diff) |
* re.c (rb_reg_s_quote): # also should be quoted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ToDo | 1 | ||||
-rw-r--r-- | ext/iconv/iconv.c | 2 | ||||
-rw-r--r-- | re.c | 2 |
4 files changed, 7 insertions, 2 deletions
@@ -27,6 +27,10 @@ Fri May 3 20:19:00 2002 WATANABE Hirofumi <eban@ruby-lang.org> * win32/config.h.in: define HAVE_DECL_SYS_NERR. +Thu May 2 23:42:40 2002 Yukihiro Matsumoto <matz@ruby-lang.org> + + * re.c (rb_reg_s_quote): # also should be quoted. + Thu May 2 18:27:13 2002 WATANABE Hirofumi <eban@ruby-lang.org> * ext/extmk.rb.in, lib/mkmf.rb: use 'do...end' instead of '{}' for @@ -102,6 +102,7 @@ Standard Libraries * pointer share mechanism similar to one in String for Array. * deprecate Array#indexes, and Array#indices. * require "1.6" etc. by /usr/lib/ruby/1.6/1.6.rb ;-) +* save both "feature names" and "normalized path" in $" Extension Libraries diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 2366a350cc..a7b1b4118e 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -188,7 +188,7 @@ iconv_failure_initialize struct iconv_env_t *env; #endif /* HAVE_PROTOTYPES */ { - if (NIL_P(rb_ivar_get(error, rb_mesg))) + if (!rb_ivar_defined(error, rb_mesg) || NIL_P(rb_ivar_get(error, rb_mesg))) rb_ivar_set(error, rb_mesg, rb_inspect(failed)); if (env) { success = rb_funcall3(env->ret, rb_inserter, 1, &success); @@ -1216,7 +1216,7 @@ rb_reg_s_quote(argc, argv) case '(': case ')': case '|': case '-': case '*': case '.': case '\\': case '?': case '+': case '^': case '$': - case ' ': + case ' ': case '#': *t++ = '\\'; break; } |