diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:27:47 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:27:47 +0000 |
commit | bdcd3d62a82d8913d1735e05f1380b84edf6914c (patch) | |
tree | c8acb3231a46a2d44cc6d8c217efa4c716e85909 | |
parent | e9e9ec43f5f601782fe841d7364723d6e4975fa7 (diff) |
merge revision(s) 36130: [Backport #5023]
* ext/readline/readline.c (Init_readline): don't set 0 to
rl_catch_signals and rl_catch_sigwinch. [Bug #5423]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/readline/readline.c | 6 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Fri Feb 22 14:25:57 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/readline/readline.c (Init_readline): don't set 0 to + rl_catch_signals and rl_catch_sigwinch. [Bug #5423] + Wed Feb 13 16:18:22 2013 NAKAMURA Usaku <usa@ruby-lang.org> * ext/json: Import JSON 1.5.5. diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 9066004f8d..971ee84e6b 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1678,10 +1678,8 @@ Init_readline() rl_attempted_completion_function = readline_attempted_completion_function; #ifdef HAVE_RL_CATCH_SIGNALS rl_catch_signals = 0; -#endif -#ifdef HAVE_RL_CATCH_SIGWINCH - rl_catch_sigwinch = 0; -#endif +#endif + #ifdef HAVE_RL_CLEAR_SIGNALS rl_clear_signals(); #endif @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 386 +#define RUBY_PATCHLEVEL 387 -#define RUBY_RELEASE_DATE "2013-02-13" +#define RUBY_RELEASE_DATE "2013-02-22" #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 22 #include "ruby/version.h" |