merges r20240 from trunk into ruby_1_9_1.

remove -K option from erb.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index ee62fc356..91b05489c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 17 11:12:24 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* bin/erb: remove -K option.
+
 Mon Nov 17 02:19:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
diff --git a/bin/erb b/bin/erb
index a6fcd5370..8541437dc 100755
--- a/bin/erb
+++ b/bin/erb
@@ -72,20 +72,6 @@ class ERB
             end
             raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
             trim_mode = arg.to_i
-          when '-K'                        # KCODE
-            arg = ARGV.req_arg
-            case arg.downcase
-            when 'e', '-e', 'euc'
-              $KCODE = 'EUC'
-            when 's', '-s', 'sjis'
-              $KCODE = 'SJIS'
-            when 'u', '-u', 'utf8'
-              $KCODE = 'UTF8'
-            when 'n', '-n', 'none'
-              $KCODE = 'NONE'
-            else
-              raise "invalid KCODE #{arg.dump}"
-            end
           when '-P'
             disable_percent = true
           when '--help'
@@ -104,7 +90,6 @@ class ERB
   -v               enable verbose mode
   -d               set $DEBUG to true
   -r [library]     load a library
-  -K [kcode]       specify KANJI code-set
   -S [safe_level]  set $SAFE (0..4)
   -T [trim_mode]   specify trim_mode (0..2, -)
   -P               ignore lines which start with "%"