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: [PATCH] * 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
---
 ChangeLog | 9 +++++++++
 re.c      | 2 +-
 string.c  | 3 +--
 version.h | 6 +++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4889ad01a6..20139c60a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Dec 18 00:26:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* 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.
+
 Mon Dec 17 21:41:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/enc-setup.mak: extracts BUILTIN_ENCOBJS.
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;
 	}
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;
diff --git a/version.h b/version.h
index b8acb43bc4..87b62e8946 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-12-17"
+#define RUBY_RELEASE_DATE "2007-12-18"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071217
+#define RUBY_RELEASE_CODE 20071218
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];