diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/irb/magic-file.rb | 3 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Dec 11 17:47:01 2012 Narihiro Nakamura <authornari@gmail.com> + + * lib/irb/magic-file.rb: set a encoding, which is detected from + the file to read, to the internal encoding. + [Bug #4281][ruby-dev:43036] + Thu Nov 15 15:17:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * gc.c (free_method_entry_i): method entry may be in diff --git a/lib/irb/magic-file.rb b/lib/irb/magic-file.rb index 861262050e..339ed60b6b 100644 --- a/lib/irb/magic-file.rb +++ b/lib/irb/magic-file.rb @@ -8,9 +8,10 @@ module IRB line = io.gets line = io.gets if line[0,2] == "#!" encoding = detect_encoding(line) + internal_encoding = encoding encoding ||= default_src_encoding io.rewind - io.set_encoding(encoding, nil) + io.set_encoding(encoding, internal_encoding) if block_given? begin @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 332 +#define RUBY_PATCHLEVEL 333 -#define RUBY_RELEASE_DATE "2012-11-15" +#define RUBY_RELEASE_DATE "2012-12-11" #define RUBY_RELEASE_YEAR 2012 -#define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 11 #include "ruby/version.h" |