ruby-changes:17653
From: yugui <ko1@a...>
Date: Tue, 2 Nov 2010 00:03:45 +0900 (JST)
Subject: [ruby-changes:17653] Ruby:r29661 (ruby_1_9_2): merges r29188 from trunk into ruby_1_9_2.
yugui 2010-11-02 00:03:31 +0900 (Tue, 02 Nov 2010) New Revision: 29661 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29661 Log: 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 Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/ext/readline/readline.c branches/ruby_1_9_2/test/readline/test_readline.rb branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 29660) +++ ruby_1_9_2/ChangeLog (revision 29661) @@ -1,3 +1,9 @@ +Mon Sep 6 10:31:59 2010 NARUSE, Yui <naruse@r...> + + * 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 <nobu@r...> * file.c (rb_file_s_readlink): symlink target should be in Index: ruby_1_9_2/ext/readline/readline.c =================================================================== --- ruby_1_9_2/ext/readline/readline.c (revision 29660) +++ ruby_1_9_2/ext/readline/readline.c (revision 29661) @@ -420,7 +420,7 @@ 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 Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 29660) +++ ruby_1_9_2/version.h (revision 29661) @@ -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 Index: ruby_1_9_2/test/readline/test_readline.rb =================================================================== --- ruby_1_9_2/test/readline/test_readline.rb (revision 29660) +++ ruby_1_9_2/test/readline/test_readline.rb (revision 29661) @@ -153,6 +153,8 @@ 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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/