diff --git a/ChangeLog b/ChangeLog
index ae55b8ed23..afff8fe6e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 31 01:18:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y (magic_comment_encoding): remove meaningless null check.
+
 Thu Jul 31 01:09:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* ext/bigdecimal/bigdecimal.c (VpIsRoundMode): fix tautology
diff --git a/parse.y b/parse.y
index 1e93d59d11..05f3a91b60 100644
--- a/parse.y
+++ b/parse.y
@@ -5805,7 +5805,7 @@ typedef void (*rb_magic_comment_setter_t)(struct parser_params *parser, const ch
 static void
 magic_comment_encoding(struct parser_params *parser, const char *name, const char *val)
 {
-    if (parser && parser->line_count != (parser->has_shebang ? 2 : 1))
+    if (parser->line_count != (parser->has_shebang ? 2 : 1))
 	return;
     parser_set_encode(parser, val);
 }