* 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, 2 deletions

diff --git a/string.c b/string.c
index 62f5c31380..18624cc116 100644
--- a/string.c
+++ b/string.c
@@ -3846,7 +3846,6 @@ rb_str_squeeze_bang(int argc, VALUE *argv, VALUE str)
     int i;
 
     if (argc == 0) {
-	memset(squeez, 1, sizeof(squeez));
 	enc = rb_enc_get(str);
     }
     else {
@@ -3868,7 +3867,7 @@ rb_str_squeeze_bang(int argc, VALUE *argv, VALUE str)
 	int c = rb_enc_codepoint(s, send, enc);
 	int clen = rb_enc_codelen(c, enc);
 
-	if (c != save || !tr_find(c, squeez, del, nodel)) {
+	if (c != save || (argc > 0 && !tr_find(c, squeez, del, nodel))) {
 	    if (t != s) rb_enc_mbcput(c, t, enc);
 	    save = c;
 	    t += clen;