mame	2010-05-25 01:54:32 +0900 (Tue, 25 May 2010)

  New Revision: 27997

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27997

  Log:
    merges r27995 from trunk into ruby_1_9_2.
    --
    * vm_eval.c (rb_f_caller): update rdoc.  a patch from Nobuhiro IMAI
      <nov at yo.rim.or.jp> in [ruby-dev:41387].

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/vm_eval.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27996)
+++ ruby_1_9_2/ChangeLog	(revision 27997)
@@ -1,3 +1,8 @@
+Tue May 25 01:46:49 2010  Yusuke Endoh  <mame@t...>
+
+	* vm_eval.c (rb_f_caller): update rdoc.  a patch from Nobuhiro IMAI
+	  <nov at yo.rim.or.jp> in [ruby-dev:41387].
+
 Mon May 24 19:00:34 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (warn_balanced, parser_yylex): no warnings after closing
Index: ruby_1_9_2/vm_eval.c
===================================================================
--- ruby_1_9_2/vm_eval.c	(revision 27996)
+++ ruby_1_9_2/vm_eval.c	(revision 27997)
@@ -1536,7 +1536,7 @@
 
 /*
  *  call-seq:
- *     caller(start=1)    -> Array or nil
+ *     caller(start=1)    -> array or nil
  *
  *  Returns the current execution stack---an array containing strings in
  *  the form ``<em>file:line</em>'' or ``<em>file:line: in
@@ -1544,7 +1544,7 @@
  *  determines the number of initial stack entries to omit from the
  *  result.
  *
- *  Returns +nil+ if _start_ is greater than or equal to the size of
+ *  Returns +nil+ if _start_ is greater than the size of
  *  current execution stack.
  *
  *     def a(skip)
@@ -1556,11 +1556,12 @@
  *     def c(skip)
  *       b(skip)
  *     end
- *     c(0)   #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
- *     c(1)   #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
- *     c(2)   #=> ["prog:8:in `c'", "prog:12"]
- *     c(3)   #=> ["prog:13"]
- *     c(4)   #=> nil
+ *     c(0)   #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10:in `<main>'"]
+ *     c(1)   #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11:in `<main>'"]
+ *     c(2)   #=> ["prog:8:in `c'", "prog:12:in `<main>'"]
+ *     c(3)   #=> ["prog:13:in `<main>'"]
+ *     c(4)   #=> []
+ *     c(5)   #=> nil
  */
 
 static VALUE

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/