1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
usa 2013-02-22 05:27:47 +00:00
parent e9e9ec43f5
commit bdcd3d62a8
3 changed files with 10 additions and 7 deletions

View file

@ -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> Wed Feb 13 16:18:22 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/json: Import JSON 1.5.5. * ext/json: Import JSON 1.5.5.

View file

@ -1678,10 +1678,8 @@ Init_readline()
rl_attempted_completion_function = readline_attempted_completion_function; rl_attempted_completion_function = readline_attempted_completion_function;
#ifdef HAVE_RL_CATCH_SIGNALS #ifdef HAVE_RL_CATCH_SIGNALS
rl_catch_signals = 0; rl_catch_signals = 0;
#endif #endif
#ifdef HAVE_RL_CATCH_SIGWINCH
rl_catch_sigwinch = 0;
#endif
#ifdef HAVE_RL_CLEAR_SIGNALS #ifdef HAVE_RL_CLEAR_SIGNALS
rl_clear_signals(); rl_clear_signals();
#endif #endif

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3" #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_YEAR 2013
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 13 #define RUBY_RELEASE_DAY 22
#include "ruby/version.h" #include "ruby/version.h"