merges r23286 from trunk into ruby_1_9_1.

--
* lib/optparse.rb (OptionParser#parse_in_order): do not make an
  option from non-option argument.  [ruby-dev:38333]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 0397382a6b..33a65c455e 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1298,7 +1298,7 @@ class OptionParser
           begin
             opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
             raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
-            argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
+            argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
             val = cb.call(val) if cb
             setter.call(sw.switch_name, val) if setter
           rescue ParseError