From 253581c432a4d2dccfe9f12102bafd9d8cc12c5a Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 7 May 2002 08:32:01 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 ++++ ToDo | 1 + ext/iconv/iconv.c | 2 +- re.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d3ed6b29f..76da3e2202 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,10 @@ Fri May 3 20:19:00 2002 WATANABE Hirofumi * win32/config.h.in: define HAVE_DECL_SYS_NERR. +Thu May 2 23:42:40 2002 Yukihiro Matsumoto + + * re.c (rb_reg_s_quote): # also should be quoted. + Thu May 2 18:27:13 2002 WATANABE Hirofumi * ext/extmk.rb.in, lib/mkmf.rb: use 'do...end' instead of '{}' for diff --git a/ToDo b/ToDo index 20d5236265..91c5787f5f 100644 --- a/ToDo +++ b/ToDo @@ -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); diff --git a/re.c b/re.c index 309b9ef578..d63ae67eea 100644 --- a/re.c +++ b/re.c @@ -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; }