yugui	2009-05-21 23:48:16 +0900 (Thu, 21 May 2009)

  New Revision: 23522

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23522

  Log:
    merges r23435 from trunk into ruby_1_9_1.
    --
    * parse.y (magic_comment_encoding): use rb_compile_warning() to
      show the currently parsing file name.  [ruby-core:23469]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/parse.y
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23521)
+++ ruby_1_9_1/ChangeLog	(revision 23522)
@@ -1,3 +1,8 @@
+Sat May 16 09:19:16 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (magic_comment_encoding): use rb_compile_warning() to
+	  show the currently parsing file name.  [ruby-core:23469]
+
 Thu May 21 21:47:34 2009  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* ext/pty/pty.c (getDevice): fixes a mistake in merging r20877.
Index: ruby_1_9_1/parse.y
===================================================================
--- ruby_1_9_1/parse.y	(revision 23521)
+++ ruby_1_9_1/parse.y	(revision 23522)
@@ -6143,8 +6143,8 @@
 magic_comment_encoding(struct parser_params *parser, const char *name, const char *val)
 {
     if (!comment_at_top(parser)) {
-	rb_warning("encoding '%s' is ignored, valid only in the first line except for shebang line.",
-		   val);
+	rb_warningS("encoding '%s' is ignored, valid only in the first line except for shebang line.",
+		    val);
 	return;
     }
     parser_set_encode(parser, val);
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23521)
+++ ruby_1_9_1/version.h	(revision 23522)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 139
+#define RUBY_PATCHLEVEL 140
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/