summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:55:08 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:55:08 +0000
commit047368022efd67e91c367f91f5c6d3050d7d7336 (patch)
tree822b88d6ec51970de422f635b2ebe979c9e18cd2
parentda9e225d87622364198d8fb63c88acf942ef53c8 (diff)
downloadruby-047368022efd67e91c367f91f5c6d3050d7d7336.tar.gz
ruby-047368022efd67e91c367f91f5c6d3050d7d7336.tar.xz
ruby-047368022efd67e91c367f91f5c6d3050d7d7336.zip
merges r25041 from trunk into ruby_1_9_1.
-- * eval.c (rb_mod_define_method): Doc fix (accepts UnboundMethod too) git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--proc.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/proc.c b/proc.c
index ed44512ca..34722a65c 100644
--- a/proc.c
+++ b/proc.c
@@ -1082,7 +1082,7 @@ rb_mod_public_instance_method(VALUE mod, VALUE vid)
* define_method(symbol) { block } => proc
*
* Defines an instance method in the receiver. The _method_
- * parameter can be a +Proc+ or +Method+ object.
+ * parameter can be a +Proc+, a +Method+ or an +UnboundMethod+ object.
* If a block is specified, it is used as the method body. This block
* is evaluated using <code>instance_eval</code>, a point that is
* tricky to demonstrate because <code>define_method</code> is private.
diff --git a/version.h b/version.h
index 6bd9c527e..a3c33ce2e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 349
+#define RUBY_PATCHLEVEL 350
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1