* 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

1 files changed, 1 insertions, 1 deletions

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;
 	}