diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-21 06:04:21 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-21 06:04:21 +0000 |
| commit | f16158b9a5247f70fff2e43deefdfeac11fce0e5 (patch) | |
| tree | 9adcaad1069f1d96720692e2dc1fb8fd195b2246 | |
| parent | 6f2d978fca767318c9655d6e0767153da6d435e8 (diff) | |
| download | ruby-f16158b9a5247f70fff2e43deefdfeac11fce0e5.tar.gz ruby-f16158b9a5247f70fff2e43deefdfeac11fce0e5.tar.xz ruby-f16158b9a5247f70fff2e43deefdfeac11fce0e5.zip | |
use rl_prep_terminal only on Windows. [ruby-core:25009]
* ext/readline/readline.c (readline_readline): use rb_prep_terminal
only on Windows.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/readline/readline.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Aug 21 15:01:35 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/readline/readline.c (readline_readline): use rb_prep_terminal + only on Windows. + Fri Aug 21 07:25:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rdoc/ri/gemdirs.rb: split from lib/rdoc/ri/paths.rb to ge diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 25b801317..abb9a0a33 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -144,7 +144,6 @@ readline_event(void) static VALUE readline_get(VALUE prompt) { - rl_prep_terminal(1); return (VALUE)readline((char *)prompt); } @@ -250,6 +249,9 @@ readline_readline(int argc, VALUE *argv, VALUE self) if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin"); +#ifdef _WIN32 + rl_prep_terminal(1); +#endif buff = (char*)rb_protect(readline_get, (VALUE)prompt, &status); if (status) { #if defined HAVE_RL_CLEANUP_AFTER_SIGNAL |