From da03c91a676f40907b51beefa49f0afb11504a11 Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 16 May 2009 10:34:59 +0000
Subject: [PATCH] merge r23443.

* sample/rss/rss_recent.rb, sample/rss/list_description.rb: use UTF-8.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                      | 5 +++++
 sample/rss/list_description.rb | 4 ++--
 sample/rss/rss_recent.rb       | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f23549ba54..aac4043cd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 16 19:35:48 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/rss_recent.rb, sample/rss/list_description.rb: use
+	UTF-8.
+
 Sat May 16 19:34:09 2009  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
diff --git a/sample/rss/list_description.rb b/sample/rss/list_description.rb
index d4b98a9ac6..990974d8f5 100755
--- a/sample/rss/list_description.rb
+++ b/sample/rss/list_description.rb
@@ -4,7 +4,7 @@ require "nkf"
 class String
   # From tdiary.rb
   def shorten( len = 120 )
-    lines = NKF::nkf( "-e -m0 -f#{len}", self.gsub( /\n/, ' ' ) ).split( /\n/ )
+    lines = NKF::nkf( "-t -m0 -f#{len}", self.gsub( /\n/, ' ' ) ).split( /\n/ )
     lines[0].concat( '...' ) if lines[0] and lines[1]
     lines[0]
   end
@@ -52,7 +52,7 @@ ARGV.each do |fname|
     puts "#{fname} does not include RSS 1.0 or 0.9x/2.0"
   else
     begin
-      rss.output_encoding = "euc-jp"
+      rss.output_encoding = "utf-8"
     rescue RSS::UnknownConversionMethodError
       error($!) if verbose
     end
diff --git a/sample/rss/rss_recent.rb b/sample/rss/rss_recent.rb
index 38b57c37fa..14c861284e 100755
--- a/sample/rss/rss_recent.rb
+++ b/sample/rss/rss_recent.rb
@@ -4,7 +4,7 @@ require "nkf"
 class String
   # From tdiary.rb
   def shorten( len = 120 )
-    lines = NKF::nkf( "-e -m0 -f#{len}", self.gsub( /\n/, ' ' ) ).split( /\n/ )
+    lines = NKF::nkf( "-t -m0 -f#{len}", self.gsub( /\n/, ' ' ) ).split( /\n/ )
     lines[0].concat( '...' ) if lines[0] and lines[1]
     lines[0]
   end
@@ -51,7 +51,7 @@ ARGV.each do |fname|
     puts "#{fname} does not include RSS 1.0 or 0.9x/2.0"
   else
     begin
-      rss.output_encoding = "euc-jp"
+      rss.output_encoding = "utf-8"
     rescue RSS::UnknownConversionMethodError
       error($!) if verbose
     end