summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-22 13:19:03 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-22 13:19:03 +0000
commita733f8f5ae777e7f89452be6a6198ca254ddda17 (patch)
treea52e17a2e0f3fcd10f6a4e07e1bb0476bf5ffaa3 /ext
parent927ca6d776cdd9e3a57635512942ba9dfd5beeb0 (diff)
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
Diffstat (limited to 'ext')
-rw-r--r--ext/readline/readline.c6
1 files changed, 6 insertions, 0 deletions
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