summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-16 07:42:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-16 07:42:01 +0000
commit1543a9f1924eba2d47e75f92e7f94627f6bf3cb8 (patch)
tree4abba159eb8fdf82beeeb6673d7f49c86209978e /lib
parentabe4ff9225a17f0c53cbc8c7472841d7b088399b (diff)
* lib/optparse.rb (Regexp): fix incorrect options when casting to
a Regexp, and suppress encoding option warnings. https://github.com/ruby/ruby/pull/82 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/optparse.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 79a95c1462..a448459d46 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1709,7 +1709,8 @@ XXX
f |= Regexp::IGNORECASE if /i/ =~ o
f |= Regexp::MULTILINE if /m/ =~ o
f |= Regexp::EXTENDED if /x/ =~ o
- k = o.delete("^imx")
+ k = o.delete("imx")
+ k = nil if k.empty?
end
Regexp.new(s || all, f, k)
end