From ebfda42d044a684f71afe0640b91608c12fb6e1b 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/shell/command-processor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/shell/command-processor.rb') diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb index b7b58bb618..900b31a22d 100644 --- a/lib/shell/command-processor.rb +++ b/lib/shell/command-processor.rb @@ -26,7 +26,7 @@ class Shell # m = [:initialize, :expand_path] if Object.methods.first.kind_of?(String) - NoDelegateMethods = m.collect{|m| m.id2name} + NoDelegateMethods = m.collect{|x| x.id2name} else NoDelegateMethods = m end @@ -124,7 +124,7 @@ class Shell f = File.open(path, mode, perm) File.chmod(perm & ~@shell.umask, path) if block_given? - f.each &b + f.each(&b) end f else -- cgit v1.2.3