summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 01:59:19 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 01:59:19 +0000
commit06191becbdf6b75bc6dee340bed52319c31ebce4 (patch)
tree8288e05258bfaeafa1537bced3cb229e86825f48 /ext
parent46af6fd7ae034d7d324d5221801073370339871e (diff)
merges r20680 and r20682 from trunk into ruby_1_9_1.
* ext/readline/readline.c (readline_s_get_completion_append_character): uses locale encoding but not ASCII-8BIT. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/readline/readline.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 6100633f2..87a1ff037 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -602,15 +602,14 @@ static VALUE
readline_s_get_completion_append_character(VALUE self)
{
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
- VALUE str;
+ char buf[1];
rb_secure(4);
if (rl_completion_append_character == '\0')
return Qnil;
- str = rb_str_new(0, 1);
- RSTRING_PTR(str)[0] = rl_completion_append_character;
- return str;
+ buf[0] = (char) rl_completion_append_character;
+ return rb_locale_str_new(buf, 1);
#else
rb_notimplement();
return Qnil; /* not reached */