shyouhei	2008-06-08 03:07:00 +0900 (Sun, 08 Jun 2008)

  New Revision: 16921

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/optparse.rb
    branches/ruby_1_8_5/version.h

  Log:
    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].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16921&r2=16920&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/optparse.rb?r1=16921&r2=16920&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16921&r2=16920&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16920)
+++ ruby_1_8_5/ChangeLog	(revision 16921)
@@ -1,3 +1,9 @@
+Sun Jun  8 03:05:59 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* numeric.c (fix_pow): returns infinity for 0**-1.  [ruby-dev:32084]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16920)
+++ ruby_1_8_5/version.h	(revision 16921)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 140
+#define RUBY_PATCHLEVEL 141
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/optparse.rb
===================================================================
--- ruby_1_8_5/lib/optparse.rb	(revision 16920)
+++ ruby_1_8_5/lib/optparse.rb	(revision 16921)
@@ -383,7 +383,7 @@
       while s = lopts.shift
         l = left[-1].length + s.length
         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
       end
 

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