merges r23474 from trunk into ruby_1_9_1.

--
* compile.c (rb_parse_in_eval): returns true in true eval, not in
  main.  [ruby-dev:38382]

* parse.y (program): inherits dvars in eval or main.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/compile.c b/compile.c
index d9f3731c3..4b99e2a68 100644
--- a/compile.c
+++ b/compile.c
@@ -5413,7 +5413,7 @@ rb_local_defined(ID id)
 int
 rb_parse_in_eval(void)
 {
-    return GET_THREAD()->parse_in_eval != 0;
+    return GET_THREAD()->parse_in_eval > 0;
 }
 
 int