From fa1bec3664c43fa58bb83a3711d61d88a2eb65ed Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 17 Jan 2009 08:59:54 +0000 Subject: * lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod. [ruby-core:21383]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/irb/xmp.rb | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index b6067fd7c2..cb95509c81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 17 17:58:22 2009 Yuki Sonoda (Yugui) + + * lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod. + [ruby-core:21383]. + Sat Jan 17 15:01:22 2009 Tanaka Akira * ext/socket/raddrinfo.c (make_inspectname): add a res argument to diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb index 851852cd3e..af87b48887 100644 --- a/lib/irb/xmp.rb +++ b/lib/irb/xmp.rb @@ -72,8 +72,20 @@ class XMP end def puts(exps) + if @encoding and exps.encoding != @encoding + enc = Encoding.compatible?(@exps.join("\n"), exps) + if enc.nil? + raise Encoding::CompatibilityError, "Encoding in which the passed exression is encoded is not compatible to the preceding's one" + else + @encoding = enc + end + else + @encoding = exps.encoding + end @exps.concat exps.split(/\n/) end + + attr_reader :encoding end end -- cgit v1.2.3