From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.86.59.13 with SMTP id h13cs437927fga; Tue, 2 Mar 2010 11:38:33 -0800 (PST) Received: by 10.224.72.96 with SMTP id l32mr59633qaj.127.1267558712816; Tue, 02 Mar 2010 11:38:32 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 8si13402552qwj.55.2010.03.02.11.38.32; Tue, 02 Mar 2010 11:38:32 -0800 (PST) Received-SPF: pass (google.com: domain of sup-talk-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-talk-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-talk-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 509341588096; Tue, 2 Mar 2010 14:38:32 -0500 (EST) Received: from www.cquest.utoronto.ca (www.cquest.utoronto.ca [192.82.128.5]) by rubyforge.org (Postfix) with ESMTP id 7A4E418582E4 for ; Tue, 2 Mar 2010 14:20:53 -0500 (EST) Received: from pinkfloyd.chass.utoronto.ca ([128.100.160.254]:52268 ident=93) by www.cquest.utoronto.ca with esmtp (Exim 4.43) id 1NmXeH-0007r8-5c; Tue, 02 Mar 2010 14:20:53 -0500 Received: from bwalton by pinkfloyd.chass.utoronto.ca with local (Exim 4.63) (envelope-from ) id 1NmXeH-0001rJ-4i; Tue, 02 Mar 2010 14:20:53 -0500 From: Ben Walton To: sup-talk@rubyforge.org Date: Tue, 2 Mar 2010 14:20:51 -0500 Message-Id: <1267557651-7110-2-git-send-email-bwalton@artsci.utoronto.ca> X-Mailer: git-send-email 1.7.0 In-Reply-To: References: Cc: Ben Walton Subject: [sup-talk] [PATCH] Remove use of Object tap method X-BeenThere: sup-talk@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: User & developer discussion of Sup List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-talk-bounces@rubyforge.org Errors-To: sup-talk-bounces@rubyforge.org Remove ruby 1.9-ism in buffer.rb. This keeps things running on older ruby versions. Signed-off-by: Ben Walton --- lib/sup/buffer.rb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb index 5772bb0..ccbd38f 100644 --- a/lib/sup/buffer.rb +++ b/lib/sup/buffer.rb @@ -612,7 +612,12 @@ EOS tf.deactivate draw_screen :sync => false, :status => status, :title => title end - tf.value.tap { |x| x.force_encoding Encoding::UTF_8 if x && x.respond_to?(:encoding) } + + v = if tf.value && tf.value.respond_to?(:encoding) + tf.value.force_encoding Encoding::UTF_8 + else + tf.value + end end def ask_getch question, accept=nil -- 1.7.0 _______________________________________________ sup-talk mailing list sup-talk@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-talk