From 096845e09f2a41943d97bbab3bb58d171679eaa2 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 19 Dec 2008 11:37:41 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/imap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/net') diff --git a/lib/net/imap.rb b/lib/net/imap.rb index e6ffa3b1e..09b534929 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -3216,7 +3216,7 @@ module Net ].join(':') ) - return response.keys.map { |k| qdval(k.to_s, response[k]) }.join(',') + return response.keys.map {|key| qdval(key.to_s, response[key]) }.join(',') when STAGE_TWO @stage = nil # if at the second stage, return an empty string -- cgit