merge revision(s) 25693:

	* eval.c (method_inspect, method_name, mnew): Bug fix when
	  method created from an alias.
	  Based on a patch by Peter Vanbroekhoven [ruby-core:22040]


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

1 files changed, 4 insertions, 4 deletions

diff --git a/eval.c b/eval.c
index 24267b033e..c11b96fe37 100644
--- a/eval.c
+++ b/eval.c
@@ -9273,8 +9273,8 @@ mnew(klass, obj, id, mklass)
     ID oid = id;
 
   again:
-    if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
-	print_undef(rklass, oid);
+    if ((body = rb_get_method_body(&klass, &oid, &noex)) == 0) {
+	print_undef(rklass, id);
     }
 
     if (nd_type(body) == NODE_ZSUPER) {
@@ -9415,7 +9415,7 @@ method_name(obj)
     struct METHOD *data;
 
     Data_Get_Struct(obj, struct METHOD, data);
-    return rb_str_new2(rb_id2name(data->oid));
+    return rb_str_new2(rb_id2name(data->id));
 }
 
 /*
@@ -9841,7 +9841,7 @@ method_inspect(method)
 	}
     }
     rb_str_buf_cat2(str, sharp);
-    rb_str_buf_cat2(str, rb_id2name(data->oid));
+    rb_str_buf_cat2(str, rb_id2name(data->id));
     rb_str_buf_cat2(str, ">");
 
     return str;