usa	2013-02-22 14:27:47 +0900 (Fri, 22 Feb 2013)

  New Revision: 39377

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39377

  Log:
    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]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/readline/readline.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 39376)
+++ ruby_1_9_3/ChangeLog	(revision 39377)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Feb 22 14:25:57 2013  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* ext/json: Import JSON 1.5.5.
Index: ruby_1_9_3/ext/readline/readline.c
===================================================================
--- ruby_1_9_3/ext/readline/readline.c	(revision 39376)
+++ ruby_1_9_3/ext/readline/readline.c	(revision 39377)
@@ -1678,10 +1678,8 @@ Init_readline() https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/readline/readline.c#L1678
     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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39376)
+++ ruby_1_9_3/version.h	(revision 39377)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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"
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36130


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/