aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/optparse.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6798e21808..429713d85c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 27 13:58:55 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser#candidate): : was missing. Thanks,
+ Shota Fukumori. [ruby-dev:42634]
+
Sat Nov 27 12:07:05 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
* man/ruby.1: Ruby man page from Arthur Gunn in [ruby-core:33412]
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 91308a9aef..6d9c46fd84 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1549,7 +1549,7 @@ XXX
end
pat = Completion.regexp(word, true)
visit(:each_option) do |opt|
- opts = (long ? opt.long : []) + (short ? opt.short [])
+ opts = (long ? opt.long : []) + (short ? opt.short : [])
opts = Completion.candidate(word, true, pat, &opts.method(:each)).map(&:first) if pat
if /\A=/ =~ opt.arg
opts.map! {|sw| sw + "="}