diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-06-03 09:40:21 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-06-03 09:40:21 +0000 |
commit | c5fc4bca6d45ac58be7ccba26fbb90664643eab3 (patch) | |
tree | 0d0876c684f83c9a662bcc1000e7150404ba53f8 /lib | |
parent | 63ae7e1c1351da7cd7291e417ba559098ee5c715 (diff) | |
download | ruby-c5fc4bca6d45ac58be7ccba26fbb90664643eab3.tar.gz |
* eval.c (rb_call_super): inheritance line adjustment moved from
rb_call(). [ruby-core:01113]
* eval.c (rb_eval): use rb_call_super() to follow DRY principle.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/imap.rb | 4 | ||||
-rw-r--r-- | lib/net/telnet.rb | 8 | ||||
-rw-r--r-- | lib/optparse.rb | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 2cbb408168..1007f2bdf6 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -263,7 +263,7 @@ Object If this mailbox exists, an array containing objects of ((<Net::IMAP::MailboxACLItem>)) will be returned. -: add_response_handler(handler = Proc.new) +: add_response_handler(handler = Block.new) Adds a response handler. ex). @@ -1047,7 +1047,7 @@ module Net return sort_internal("UID SORT", sort_keys, search_keys, charset) end - def add_response_handler(handler = Proc.new) + def add_response_handler(handler = Block.new) @response_handlers.push(handler) end diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index b03cbc7a73..89bb8ef044 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -480,6 +480,14 @@ module Net buf = preprocess(c) rest = '' end + else + # Not Telnetmode. + # + # We cannot use preprocess() on this data, because that + # method makes some Telnetmode-specific assumptions. + buf = c + buf.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"] + rest = '' end @log.print(buf) if @options.has_key?("Output_log") line += buf diff --git a/lib/optparse.rb b/lib/optparse.rb index 295f2bc94b..7a2cfc49c9 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -167,7 +167,7 @@ Individual switch class. =end #'#"#`# def initialize(pattern = nil, conv = nil, short = nil, long = nil, arg = nil, - desc = ([] if short or long), block = Proc.new) + desc = ([] if short or long), block = Block.new) @pattern, @conv, @short, @long, @arg, @desc, @block = pattern, conv, short, long, arg, desc, block end |