aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-04-20 03:26:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-04-20 03:26:19 +0000
commitdc8147bca9715b114745ce8bea211fb40ec583cc (patch)
tree63768920faf5bbcc94862403db6f47118fca2cec
parentcc1757bce8abc852963b9253e930e2599055c653 (diff)
downloadruby-dc8147bca9715b114745ce8bea211fb40ec583cc.tar.gz
* lib/optparse.rb: fix to override conv proc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/optparse.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b93143aefc..31ce18a727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb: fix to override conv proc.
+
Fri Apr 20 12:21:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ruby_cleanup): fixed access to out of bound, and inversed
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 1808487337..854805a82a 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1076,7 +1076,7 @@ class OptionParser
# directly specified pattern(any object possible to match)
if !(String === o) and o.respond_to?(:match)
pattern = notwice(o, pattern, 'pattern')
- conv ||= pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
+ conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
next
end