merges r20145 from trunk into ruby_1_9_1.

* ext/curses/curses.c: curses encoding should obey locale.

* ext/curses/curses.c (curses_getch): 1.9 getch should return one
  character string for single byte string.  wchar_t support may
  follow in the future.

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

1 files changed, 6 insertions, 0 deletions

diff --git a/string.c b/string.c
index 08f3cdbf5c..3dd86c9119 100644
--- a/string.c
+++ b/string.c
@@ -571,6 +571,12 @@ rb_str_export(VALUE str)
 }
 
 VALUE
+rb_str_export_locale(VALUE str)
+{
+    return rb_str_conv_enc(str, STR_ENC_GET(str), rb_locale_encoding());
+}
+
+VALUE
 rb_str_export_to_enc(VALUE str, rb_encoding *enc)
 {
     return rb_str_conv_enc(str, STR_ENC_GET(str), enc);