* parse.y (parser_yylex): removed an useless conditional, and magic

  comment are ignored unless at the first of line.

* test/ruby/test_m17n.rb (test_magic_comment_vim): added.

* test/ruby/test_m17n.rb (test_magic_comment_at_variaous_positions):
  added.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 5 deletions

diff --git a/parse.y b/parse.y
index 05f3a91b60..6abc2da09e 100644
--- a/parse.y
+++ b/parse.y
@@ -6076,12 +6076,11 @@ parser_yylex(struct parser_params *parser)
 	goto retry;
 
       case '#':		/* it's a comment */
-	if (!parser->has_shebang || parser->line_count != 1) {
-	    /* no magic_comment in shebang line */
+	/* no magic_comment in shebang line */
+	if (parser->line_count == (parser->has_shebang ? 2 : 1) 
+	    && (lex_p - lex_pbeg) == 1) {
 	    if (!parser_magic_comment(parser, lex_p, lex_pend - lex_p)) {
-		if (parser->line_count == (parser->has_shebang ? 2 : 1)) {
-		    set_file_encoding(parser, lex_p, lex_pend);
-		}
+		set_file_encoding(parser, lex_p, lex_pend);
 	    }
 	}
 	lex_p = lex_pend;