yugui	2008-11-19 01:47:59 +0900 (Wed, 19 Nov 2008)

  New Revision: 20267

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20267

  Log:
    merges r20240 from trunk into ruby_1_9_1.
    remove -K option from erb.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/bin/erb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20266)
+++ ruby_1_9_1/ChangeLog	(revision 20267)
@@ -1,3 +1,7 @@
+Mon Nov 17 11:12:24 2008  Masatoshi SEKI  <m_seki@m...>
+
+	* bin/erb: remove -K option.
+
 Mon Nov 17 02:19:03 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (LIBRUBYARG_STATIC): fixed for --enable-rpath.
Index: ruby_1_9_1/bin/erb
===================================================================
--- ruby_1_9_1/bin/erb	(revision 20266)
+++ ruby_1_9_1/bin/erb	(revision 20267)
@@ -72,20 +72,6 @@
             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 @@
   -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 "%"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/