From e1960cdba2d4c7f4105697402671ab252ee6a3e4 Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Oct 2011 09:42:41 +0000
Subject: merge revision(s) 33390:

	* proc.c (proc_call):  Fix documentation of Proc#call vs Proc#===.
	  [Ruby 1.9 - Bug #5349]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 proc.c    | 26 ++++++++++++++------------
 version.h |  6 +++---
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5817de871b..27d01c0104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct  8 05:38:29 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* proc.c (proc_call):  Fix documentation of Proc#call vs Proc#===.
+	  [Ruby 1.9 - Bug #5349]
+
 Tue Sep 27 13:05:39 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
 
 	* ext/openssl/ossl_asn1.c: fix int_ossl_asn1_decode0_cons when being
diff --git a/proc.c b/proc.c
index 47c8614480..ef383b5492 100644
--- a/proc.c
+++ b/proc.c
@@ -493,6 +493,16 @@ proc_lambda(void)
     return rb_block_lambda();
 }
 
+/*  Document-method: ===
+ *
+ *  call-seq:
+ *     proc === obj   -> result_of_proc
+ *
+ *  Invokes the block with +obj+ as the proc's parameter like Proc#call.  It
+ *  is to allow a proc object to be a target of +when+ clause in a case
+ *  statement.
+ */
+
 /* CHECKME: are the argument checking semantics correct? */
 
 /*
@@ -508,10 +518,10 @@ proc_lambda(void)
  *  to an array).  Note that prc.() invokes prc.call() with the parameters
  *  given.  It's a syntax sugar to hide "call".
  *
- *  For procs created using <code>Kernel.proc</code>, generates an
- *  error if the wrong number of parameters
- *  are passed to a proc with multiple parameters. For procs created using
- *  <code>Proc.new</code>, extra parameters are silently discarded.
+ *  For procs created using <code>Kernel.proc</code> an error is generated
+ *  if the wrong number of parameters are passed to a proc with multiple
+ *  parameters. For procs created using <code>Proc.new</code>, extra
+ *  parameters are silently discarded.
  *
  *  Returns the value of the last expression evaluated in the block. See
  *  also <code>Proc#yield</code>.
@@ -529,14 +539,6 @@ proc_lambda(void)
  *     	from prog.rb:5
  */
 
-/*
- *  call-seq:
- *     prc === obj   -> result_of_proc
- *
- *  Invokes the block, with <i>obj</i> as the block's parameter.  It is
- *  to allow a proc object to be a target of +when+ clause in the case statement.
- */
-
 static VALUE
 proc_call(int argc, VALUE *argv, VALUE procval)
 {
diff --git a/version.h b/version.h
index d33f135d14..84c995249f 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
 #define RUBY_PATCHLEVEL -1
 
-#define RUBY_RELEASE_DATE "2011-09-27"
+#define RUBY_RELEASE_DATE "2011-10-08"
 #define RUBY_RELEASE_YEAR 2011
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_MONTH 10
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3