signal to main_thread

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 1 deletions

diff --git a/re.c b/re.c
index 336a40b35f..2934091a81 100644
--- a/re.c
+++ b/re.c
@@ -147,7 +147,7 @@ kcode_set_option(reg)
 	mbcinit(MBCTYPE_EUC);
 	break;
       case KCODE_SJIS:
-	mbcinit(MBCTYPE_EUC);
+	mbcinit(MBCTYPE_SJIS);
 	break;
     }
 }	  
@@ -883,6 +883,10 @@ reg_regsub(str, src, regs)
 	char *ss = s;
 
 	c = *s++;
+	if (ismbchar(c)) {
+	    s++;
+	    continue;
+	}
 	if (c != '\\' || s == e) continue;
 
 	if (!val) val = str_new(p, ss-p);