From 3f21c1cdb145fcb6106d77e6c7415e3fcaf8c91e Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Oct 2009 14:15:47 +0000 Subject: merges r24594 and r24604 from trunk into ruby_1_9_1. -- Fix: change terminal's size on Widows when the window size is changed * ext/readline/readline.c (readline_get): add rl_prep_terminal(1). insited by jitte [ruby-list:43546] -- 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/branches/ruby_1_9_1@25540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ ext/readline/readline.c | 3 +++ version.h | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8c5a239a3..02a3603e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Aug 21 15:01:35 2009 NARUSE, Yui + + * ext/readline/readline.c (readline_readline): use rb_prep_terminal + only on Windows. + +Thu Aug 20 14:39:47 2009 NARUSE, Yui + + * ext/readline/readline.c (Init_readline): add rl_prep_terminal(1). + insited by jitte [ruby-list:43546] + Thu Aug 20 08:39:50 2009 Yukihiro Matsumoto * thread.c (rb_thread_terminate_all): do not ignore interrupt when diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 90eaeec39..48be2b843 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -225,6 +225,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((VALUE(*)_((VALUE)))readline, (VALUE)prompt, &status); if (status) { diff --git a/version.h b/version.h index ceb66014e..c91787c78 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 299 +#define RUBY_PATCHLEVEL 300 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit