merge revision(s) 19690:

	* eval.c (rb_mod_modfunc): method undefined in included module
	  may not have nd_body.  [ruby-core:18738]


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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d0e96ea86..3e6b51552d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 28 22:48:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_mod_modfunc): method undefined in included module
+	  may not have nd_body.  [ruby-core:18738]
+
 Wed Jan 28 20:53:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (marshal_dump): fixed for check_dump_arg.
diff --git a/eval.c b/eval.c
index ee85f1e40f..8bc5149ce2 100644
--- a/eval.c
+++ b/eval.c
@@ -7577,7 +7577,7 @@ rb_mod_modfunc(argc, argv, module)
 		body = search_method(rb_cObject, id, &m);
 	    }
 	    if (body == 0 || body->nd_body == 0) {
-		rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
+		print_undef(module, id);
 	    }
 	    if (nd_type(body->nd_body) != NODE_ZSUPER) {
 		break;		/* normal case: need not to follow 'super' link */
diff --git a/version.h b/version.h
index daf5f8885c..7267bcbda2 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-01-28"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090128
-#define RUBY_PATCHLEVEL 313
+#define RUBY_PATCHLEVEL 314
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8