From ebfcc5d9337ec64e2ddb9c4125b7768df1b1995a Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 17 Dec 2007 16:06:21 +0000
Subject: * re.c (rb_reg_initialize): raise error if non-Unicode fixed  
 encoding option is specified for regexp literals with \u{}   escapes.

* string.c (rb_str_squeeze_bang): should squeeze multibyte
  characters as well.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 re.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 're.c')

diff --git a/re.c b/re.c
index ce1d66863a..a8774237af 100644
--- a/re.c
+++ b/re.c
@@ -1971,7 +1971,7 @@ rb_reg_initialize(VALUE obj, const char *s, int len, rb_encoding *enc,
         return -1;
 
     if (fixed_enc) {
-	if (fixed_enc != enc && enc != d_enc && fixed_enc != d_enc) {
+	if (fixed_enc != enc && (options & ARG_ENCODING_FIXED)) {
 	    strcpy(err, "character encodings differ");
 	    return -1;
 	}
-- 
cgit v1.2.3