aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/readline/readline.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 28f0b3a15f..ccaeca8b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 7 20:19:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/readline/readline.c (Init_readline): rl_catch_signals=0 returns
+ back. Without this, on FreeBSD9 and readline 6.2 irb can't catch ^C.
+ [Bug #5423]
+
Tue Aug 07 20:12:39 2012 Koichi Sasada <ko1@atdot.net>
* vm_exec.c, insns.def (leave): solve problems on
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 5b984a77f8..3749c59c4f 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1885,6 +1885,9 @@ Init_readline()
#if defined(HAVE_RL_PRE_INPUT_HOOK)
rl_pre_input_hook = (Function *)readline_pre_input_hook;
#endif
+#ifdef HAVE_RL_CATCH_SIGNALS
+ rl_catch_signals = 0;
+#endif
#ifdef HAVE_RL_CLEAR_SIGNALS
rl_clear_signals();
#endif