From a733f8f5ae777e7f89452be6a6198ca254ddda17 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 22 May 2010 13:19:03 +0000 Subject: merge revision(s) 26712: * ext/readline/readline.c (Init_readline): initialize check rl_catch_signals and rl_catch_sigwinch. [ruby-core:28238] [ruby-core:28242] * ext/readline/extconf.rb: check rl_catch_signals and rl_catch_sigwinch. * ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb: [ruby-core:25702] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 ++++++++++- ext/readline/readline.c | 6 ++++++ version.h | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9163ddfa64..6dcfcd8e78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat May 22 22:14:11 2010 NARUSE, Yui + + * ext/readline/readline.c (Init_readline): initialize + check rl_catch_signals and rl_catch_sigwinch. + [ruby-core:28238] [ruby-core:28242] + + * ext/readline/extconf.rb: check rl_catch_signals and + rl_catch_sigwinch. + Sat May 22 21:54:58 2010 URABE Shyouhei * test/net/http/test_connection.rb (TestHTTP::HTTPConnectionTest#test_connection_refused_in_request): @@ -318,7 +327,7 @@ Thu Nov 19 18:03:31 2009 Takeyuki FUJIOKA * lib/cgi.rb (CGI.unescapeHTML): fix for hex values 80-FF, single-byte hex entity encodings from 80-FF are valid HTML. - [ruby-core:25702] + [ruby-core:25702] Thu Nov 19 15:34:40 2009 Yukihiro Matsumoto diff --git a/ext/readline/readline.c b/ext/readline/readline.c index c9acaadac9..637cb9950b 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -833,6 +833,12 @@ Init_readline() #ifdef HAVE_RL_EVENT_HOOK rl_event_hook = readline_event; #endif +#ifdef HAVE_RL_CATCH_SIGNALS + rl_catch_signals = 0; +#endif +#ifdef HAVE_RL_CATCH_SIGWINCH + rl_catch_sigwinch = 0; +#endif #ifdef HAVE_RL_CLEAR_SIGNALS rl_clear_signals(); #endif diff --git a/version.h b/version.h index 8f4d222d19..d188196333 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-05-22" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20100522 -#define RUBY_PATCHLEVEL 263 +#define RUBY_PATCHLEVEL 264 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3