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

3 files changed, 10 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b89dc21bd..ebf2534329 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index 7669b19c3d..10ec8736c1 100644
--- a/version.h
+++ b/version.h
@@ -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"