* parse.y (opt_rescue): use NODE_ERRINFO() instead of

  NODE_GVAR("$!"), to avoid confusion from variable aliasing.
  [ruby-talk:90074]

* version.c (Init_version): remove obsolete constants VERSION
  etc.  [ruby-dev:22643]


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

1 files changed, 2 insertions, 2 deletions

diff --git a/parse.y b/parse.y
index 1b0608d8e7..8d3a3cc3e3 100644
--- a/parse.y
+++ b/parse.y
@@ -384,7 +384,7 @@ stmts		: none
 		    }
 		| stmts terms stmt
 		    {
-			$$ = block_append($1, $3);
+			$$ = block_append($1, newline_node($3));
 		    }
 		| error stmt
 		    {
@@ -1858,7 +1858,7 @@ opt_rescue	: kRESCUE exc_list exc_var then
 		  opt_rescue
 		    {
 		        if ($3) {
-		            $3 = node_assign($3, NEW_GVAR(rb_intern("$!")));
+		            $3 = node_assign($3, NEW_ERRINFO());
 			    $5 = block_append($3, $5);
 			}
 			$$ = NEW_RESBODY($2, $5, $6);