summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xbin/erb15
2 files changed, 4 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 20a1522..d216c4a 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 a6fcd53..8541437 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 "%"