merges r29188 from trunk into ruby_1_9_2.

--
* ext/readline/readline.c (readline_s_get_line_buffer):
  Readline.line_buffer should return locale string.
  [ruby-dev:42184] #3791

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index 5871f4c2bb..fc1e719462 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -153,6 +153,8 @@ class TestReadline < Test::Unit::TestCase
         assert_equal("first second", actual_line_buffer)
         assert_equal(12, actual_point)
         assert_equal("first complete finish", Readline.line_buffer)
+        assert_equal(Encoding.find("locale"), Readline.line_buffer.encoding)
+        assert_equal(true, Readline.line_buffer.tainted?)
         assert_equal(21, Readline.point)
       ensure
         stdin.close(true)