diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:41 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:41 +0000 |
| commit | ebfda42d044a684f71afe0640b91608c12fb6e1b (patch) | |
| tree | 2da96933c7d0ba4d6cc44b41e143d323016d3241 /lib/irb | |
| parent | bd938eccaf3aa8848faf9eebd6d7d15c24614561 (diff) | |
merges r20859 from trunk into ruby_1_9_1.
* lib/optparse/version.rb: remove variable shadowing to stop
warning. [ruby-core:20612]
* lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb,
lib/rinda/ring.rb, lib/racc/parser.rb,
lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto.
* lib/racc/parser.rb: remove space before parentheses.
* lib/shell/command-processor.rb, lib/shell/process-controller.rb:
use parentheses around arguments.
* lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb,
lib/yaml/baseemitter.rb: indentation fix.
* lib/matrix.rb: small cosmetic change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/irb')
| -rw-r--r-- | lib/irb/completion.rb | 2 | ||||
| -rw-r--r-- | lib/irb/ext/change-ws.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index 0db470db94..26339f217d 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -159,7 +159,7 @@ module IRB end next if name != "IRB::Context" and /^(IRB|SLex|RubyLex|RubyToken)/ =~ name - candidates.concat m.instance_methods(false).collect{|m| m.to_s} + candidates.concat m.instance_methods(false).collect{|x| x.to_s} } candidates.sort! candidates.uniq! diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb index dd8f145b27..217d4a58ef 100644 --- a/lib/irb/ext/change-ws.rb +++ b/lib/irb/ext/change-ws.rb @@ -56,6 +56,6 @@ module IRB # end # end # alias change_workspace change_binding - end + end end |