aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-27 15:00:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-27 15:00:21 +0000
commitc3144a39a75c3f0ab2052e1e92ecdcae33889f2a (patch)
tree0008321405d619f122784496fe5b4e8445598668
parentc1bf7315ae9e6bf2708ec0a7a9a9abdd8f5fc238 (diff)
downloadruby-c3144a39a75c3f0ab2052e1e92ecdcae33889f2a.tar.gz
* lib/optparse.rb (CompletingHash#match): fix for 1.9.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9748 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 83fbb9d328..4653aa715a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 27 23:59:53 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (CompletingHash#match): fix for 1.9.
+
Tue Dec 27 14:17:55 2005 Tanaka Akira <akr@m17n.org>
* configure.in: define IA64 for portability. (HP aC++/ANSI C doesn't
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 966de0ed68..0850ffd15e 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -700,7 +700,7 @@ class OptionParser
# Completion for hash key.
#
def match(key)
- return key, *fetch(key) {
+ return key, fetch(key) {
raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
}
end