From 13fdd22f20c06aa9b1f0aec7b582261930c5f78c Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 1 Nov 2010 15:03:31 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ ext/readline/readline.c | 2 +- test/readline/test_readline.rb | 2 ++ version.h | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ee8ccf001..0c37e5a79d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 6 10:31:59 2010 NARUSE, Yui + + * ext/readline/readline.c (readline_s_get_line_buffer): + Readline.line_buffer should return locale string. + [ruby-dev:42184] #3791 + Sat Sep 4 23:48:47 2010 Nobuyoshi Nakada * file.c (rb_file_s_readlink): symlink target should be in diff --git a/ext/readline/readline.c b/ext/readline/readline.c index df66ea6187..2963fa2dfc 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -420,7 +420,7 @@ readline_s_get_line_buffer(VALUE self) rb_secure(4); if (rl_line_buffer == NULL) return Qnil; - return rb_tainted_str_new2(rl_line_buffer); + return rb_locale_str_new_cstr(rl_line_buffer); } #else #define readline_s_get_line_buffer rb_f_notimplement 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) diff --git a/version.h b/version.h index 082f83ae71..07abe686ed 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 30 +#define RUBY_PATCHLEVEL 31 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1