2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 88669d2bc5..88392abfef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 22 23:10:59 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* proc.c (mnew): fix wrong error message when Kernel#public_method
+	  receives name of private method.  [Bug #2425]
+
 Thu Apr 22 22:56:42 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* bootstraptest/test_thread.rb: fix test.  [Bug #2342]
diff --git a/proc.c b/proc.c
index eff7a0bbbc..7e8e0e19d9 100644
--- a/proc.c
+++ b/proc.c
@@ -925,7 +925,16 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
     if (flag == NOEX_UNDEF) {
 	flag = me->flag;
 	if (scope && (flag & NOEX_MASK) != NOEX_PUBLIC) {
-	    rb_print_undef(rclass, def->original_id, (int)(flag & NOEX_MASK));
+	    const char *v = "";
+	    switch (flag & NOEX_MASK) {
+		case NOEX_PRIVATE: v = "private"; break;
+		case NOEX_PROTECTED: v = "protected"; break;
+	    }
+	    rb_name_error(id, "method `%s' for %s `%s' is %s",
+			  rb_id2name(id),
+			  (TYPE(klass) == T_MODULE) ? "module" : "class",
+			  rb_class2name(klass),
+			  v);
 	}
     }
     if (def && def->type == VM_METHOD_TYPE_ZSUPER) {