merges r21625 from trunk into ruby_1_9_1.

* lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod.
  [ruby-core:21383].

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
index 851852cd3..af87b4888 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