archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r29188 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-11-01 15:03:31 +00:00
parent 62dcfe959f
commit 13fdd22f20
4 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Sep 6 10:31:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org>
* file.c (rb_file_s_readlink): symlink target should be in

2
ext/readline/readline.c
View file

@ -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

2
test/readline/test_readline.rb
View file

@ -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)

2
version.h
View file

@ -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