mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 13823:
* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form option with very long argument. a patch from Kobayashi Noritada <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5d53d594f0
commit
0c7a99724f
3 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
Sun Jun 8 03:05:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
|
||||||
|
option with very long argument. a patch from Kobayashi Noritada
|
||||||
|
<nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
|
||||||
|
|
||||||
Sun Jun 8 03:03:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sun Jun 8 03:03:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084]
|
* numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084]
|
||||||
|
|
|
@ -383,7 +383,7 @@ class OptionParser
|
||||||
while s = lopts.shift
|
while s = lopts.shift
|
||||||
l = left[-1].length + s.length
|
l = left[-1].length + s.length
|
||||||
l += arg.length if left.size == 1 && arg
|
l += arg.length if left.size == 1 && arg
|
||||||
l < max or left << ''
|
l < max or sopts.empty? or left << ''
|
||||||
left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
|
left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define RUBY_RELEASE_DATE "2008-06-08"
|
#define RUBY_RELEASE_DATE "2008-06-08"
|
||||||
#define RUBY_VERSION_CODE 185
|
#define RUBY_VERSION_CODE 185
|
||||||
#define RUBY_RELEASE_CODE 20080608
|
#define RUBY_RELEASE_CODE 20080608
|
||||||
#define RUBY_PATCHLEVEL 140
|
#define RUBY_PATCHLEVEL 141
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
#define RUBY_VERSION_MINOR 8
|
#define RUBY_VERSION_MINOR 8
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue