2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 17ebd1772..ca7f6924c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep  2 11:36:20 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_eval): backported from HEAD.
+
 Wed Sep  1 21:18:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/lib/tk/spinbox.rb: fix typo
diff --git a/eval.c b/eval.c
index d77ecd585..541ea8580 100644
--- a/eval.c
+++ b/eval.c
@@ -6387,8 +6387,14 @@ rb_obj_instance_eval(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
-    VALUE klass = rb_singleton_class(self);
+    VALUE klass;
 
+    if (FIXNUM_P(self) || SYMBOL_P(self)) {
+	klass = Qnil;
+    }
+    else {
+	klass = rb_singleton_class(self);
+    }
     return specific_eval(argc, argv, klass, self);
 }