summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 08:47:37 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 08:47:37 +0000
commit1ab4abf8c35148d8bceb6f24bdc41ebae0f94d58 (patch)
tree58c29a508a975fa2badf5f9ba49c551f538fec5b /lib
parent1fc111198aaa4bcc184d4dbb151fccdbf2ee1da6 (diff)
merge revision(s) 38285: [Backport #4281]
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/irb/magic-file.rb3
1 files changed, 2 insertions, 1 deletions
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