From 98e6f9a79cc74ab22eafd7cf937c7eb8e9b860d5 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 16 Oct 2008 22:39:04 +0000
Subject: [PATCH] * re.c (rb_reg_initialize_m): changed the message to clarify
 the   third option argument is now ignored.  [ruby-dev:36753]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 re.c      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ca156bb39b..fa5c991b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,11 @@ Thu Oct 16 14:30:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (lib): installs all files other than README etc.
 
+Thu Oct 16 09:48:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_m): changed the message to clarify the
+	  third option argument is now ignored.  [ruby-dev:36753]
+
 Thu Oct 16 08:14:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.c (proc_options): no warning when default_external already
diff --git a/re.c b/re.c
index 03d9dc3527..48a12ee3bc 100644
--- a/re.c
+++ b/re.c
@@ -2798,7 +2798,7 @@ rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
 		flags |= ARG_ENCODING_FIXED;
 	    }
 	    else {
-		rb_warning("encoding option is obsolete - %s", kcode);
+		rb_warn("encoding option is ignored - %s", kcode);
 	    }
 	}
 	str = argv[0];