From 92e6f22226e3bd99318890b854c7213c9db09f3d Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 21 May 2009 14:48:16 +0000 Subject: 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] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 4 ++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23c1628bc..afb49566b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat May 16 09:19:16 2009 Nobuyoshi Nakada + + * 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) * ext/pty/pty.c (getDevice): fixes a mistake in merging r20877. diff --git a/parse.y b/parse.y index 0ebfc37a6..7be492a69 100644 --- a/parse.y +++ b/parse.y @@ -6143,8 +6143,8 @@ static void 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); diff --git a/version.h b/version.h index 7a598e42a..aba88b849 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit