diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 08:59:54 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-17 08:59:54 +0000 |
| commit | b6cd104ad49384a8f4641ea8bbb847fbf71f30de (patch) | |
| tree | 6fb34e5e7134896756e57a361fd04f2780ed6881 | |
| parent | 6d319eb76881e06ab33397a50f9833fe65dc4d28 (diff) | |
| download | ruby-b6cd104ad49384a8f4641ea8bbb847fbf71f30de.tar.gz ruby-b6cd104ad49384a8f4641ea8bbb847fbf71f30de.tar.xz ruby-b6cd104ad49384a8f4641ea8bbb847fbf71f30de.zip | |
* lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod.
[ruby-core:21383].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/irb/xmp.rb | 12 |
2 files changed, 17 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Jan 17 17:58:22 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod. + [ruby-core:21383]. + Sat Jan 17 15:01:22 2009 Tanaka Akira <akr@fsij.org> * ext/socket/raddrinfo.c (make_inspectname): add a res argument to 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 |