diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-20 16:45:41 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-20 16:45:41 +0000 |
| commit | 45f539317e3b65a41d85236b9cb5e8ad0e6daf31 (patch) | |
| tree | 77a3e260242dc179917075ae3e9b73f75a60fd3c /lib | |
| parent | fdb5c5e28de29952c4fc2988b38bbd1294855ce8 (diff) | |
| download | ruby-45f539317e3b65a41d85236b9cb5e8ad0e6daf31.tar.gz ruby-45f539317e3b65a41d85236b9cb5e8ad0e6daf31.tar.xz ruby-45f539317e3b65a41d85236b9cb5e8ad0e6daf31.zip | |
* eval.c (rb_require_safe): preserve old ruby_errinfo.
[ruby-talk:95409]
* eval.c (rb_f_raise): should not clear backtrace information if
exception object already have one.
* parse.y (assoc_list): allow {sym: val} style Hash. [Ruby2]
this change is done by Nobuyoshi Nakada <nobu@ruby-lang.org>.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/optparse.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index 1b083b8e6..4a979a78d 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -417,7 +417,7 @@ class OptionParser yield(indent + l) end - while (l = left.shift; r = right.shift; l or r) + while begin l = left.shift; r = right.shift; l or r end l = l.to_s.ljust(width) + ' ' + r if r and !r.empty? yield(indent + l) end |