merge revision(s) 15425:

shyouhei · shyouhei · commit 465eec715865 · 2008-06-13T03:10:19.000Z
* lib/benchmark.rb (Job::Benchmark#item): fix typo.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 13 12:10:13 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/benchmark.rb (Job::Benchmark#item): fix typo.
+
 Fri Jun 13 12:06:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
@@ -333,7 +333,7 @@ def initialize(width)
     # Registers the given label and block pair in the job list.
     #
     def item(label = "", &blk) # :yield:
-      raise ArgmentError, "no block" unless block_given?
+      raise ArgumentError, "no block" unless block_given?
       label.concat ' '
       w = label.length
       @width = w if @width < w
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-13"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080613
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 174
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ def initialize(width)`
`333`	`333`	`# Registers the given label and block pair in the job list.`
`334`	`334`	`#`
`335`	`335`	`def item(label = "", &blk) # :yield:`
`336`		`- raise ArgmentError, "no block" unless block_given?`
	`336`	`+ raise ArgumentError, "no block" unless block_given?`
`337`	`337`	`label.concat ' '`
`338`	`338`	`w = label.length`
`339`	`339`	`@width = w if @width < w`