aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--lib/cgi.rb12
-rw-r--r--lib/irb/init.rb2
-rw-r--r--lib/rdoc/options.rb9
-rw-r--r--version.h6
5 files changed, 15 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 13661d96a6..29eac87231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Dec 15 01:57:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/rdoc/options.rb (Options::parse): do not access $KCODE any
+ longer. [ruby-core:14079]
+
+ * lib/irb/init.rb (IRB::IRB.parse_opts): ditto.
+
+ * lib/cgi.rb (CGI::CGI): ditto.
+
Fri Dec 14 18:18:31 2007 Tanaka Akira <akr@fsij.org>
* thread_pthread.ci (native_thread_create): twice the stack size.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index fad6d3f468..9af4c9cf24 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -378,21 +378,13 @@ class CGI
if Integer($1) < 256
Integer($1).chr
else
- if Integer($1) < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
- [Integer($1)].pack("U")
- else
- "&##{$1};"
- end
+ "&##{$1};"
end
when /\A#x([0-9a-f]+)\z/ni then
if $1.hex < 256
$1.hex.chr
else
- if $1.hex < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
- [$1.hex].pack("U")
- else
- "&#x#{$1};"
- end
+ "&#x#{$1};"
end
else
"&#{match};"
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 0fd54ee806..3b455ec582 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -140,8 +140,6 @@ module IRB
when /^-I(.+)?/
opt = $1 || ARGV.shift
load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
- when /^-K(.)/
- $KCODE = $1
when "--inspect"
@CONF[:INSPECT_MODE] = true
when "--noinspect"
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index bea7e6bdcd..84d92424a3 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -375,14 +375,7 @@ class Options
@css = nil
@webcvs = nil
- @charset = case $KCODE
- when /^S/i
- 'Shift_JIS'
- when /^E/i
- 'EUC-JP'
- else
- 'iso-8859-1'
- end
+ @charset = 'iso-8859-1'
accessors = []
diff --git a/version.h b/version.h
index daf268fedc..3f9ff248c6 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-12-14"
+#define RUBY_RELEASE_DATE "2007-12-15"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071214
+#define RUBY_RELEASE_CODE 20071215
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];