2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 37bb3b3690..a93677bff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar  6 12:15:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (opt_block_param): command can start just after block param
+	  definition.  [ruby-list:44479]
+
 Thu Mar  6 00:34:11 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/erb.rb: update RDoc. Thanks Makoto Kuwata [ruby-dev:33702]
diff --git a/parse.y b/parse.y
index bde4c1d095..8fd4607d3a 100644
--- a/parse.y
+++ b/parse.y
@@ -1765,14 +1765,17 @@ opt_block_var	: none
 		| '|' /* none */ '|'
 		    {
 			$$ = (NODE*)1;
+			command_start = Qtrue;
 		    }
 		| tOROP
 		    {
 			$$ = (NODE*)1;
+			command_start = Qtrue;
 		    }
 		| '|' block_var '|'
 		    {
 			$$ = $2;
+			command_start = Qtrue;
 		    }
 		;