shyouhei	2010-05-22 22:19:03 +0900 (Sat, 22 May 2010)

  New Revision: 27959

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

  Log:
    merge revision(s) 26712:
    * ext/readline/readline.c (Init_readline): initialize
      check rl_catch_signals and rl_catch_sigwinch.
      [ruby-core:28238] [ruby-core:28242]
    * ext/readline/extconf.rb: check rl_catch_signals and
      rl_catch_sigwinch.
    * ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb:
      [ruby-core:25702]

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

Index: ruby_1_8_7/ext/readline/readline.c
===================================================================
--- ruby_1_8_7/ext/readline/readline.c	(revision 27958)
+++ ruby_1_8_7/ext/readline/readline.c	(revision 27959)
@@ -833,6 +833,12 @@
 #ifdef HAVE_RL_EVENT_HOOK
     rl_event_hook = readline_event;
 #endif
+#ifdef HAVE_RL_CATCH_SIGNALS
+    rl_catch_signals = 0;
+#endif
+#ifdef HAVE_RL_CATCH_SIGWINCH
+    rl_catch_sigwinch = 0;
+#endif
 #ifdef HAVE_RL_CLEAR_SIGNALS
     rl_clear_signals();
 #endif
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 27958)
+++ ruby_1_8_7/ChangeLog	(revision 27959)
@@ -1,3 +1,12 @@
+Sat May 22 22:14:11 2010  NARUSE, Yui  <naruse@r...>
+
+	* ext/readline/readline.c (Init_readline): initialize
+	  check rl_catch_signals and rl_catch_sigwinch.
+	  [ruby-core:28238] [ruby-core:28242]
+
+	* ext/readline/extconf.rb: check rl_catch_signals and
+	  rl_catch_sigwinch.
+
 Sat May 22 21:54:58 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* test/net/http/test_connection.rb (TestHTTP::HTTPConnectionTest#test_connection_refused_in_request):
@@ -318,7 +327,7 @@
 
 	* lib/cgi.rb (CGI.unescapeHTML): fix for hex values 80-FF,
 	  single-byte hex entity encodings from 80-FF are valid HTML.
-		[ruby-core:25702]
+	  [ruby-core:25702]
 
 Thu Nov 19 15:34:40 2009  Yukihiro Matsumoto  <matz@r...>
 
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 27958)
+++ ruby_1_8_7/version.h	(revision 27959)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-05-22"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100522
-#define RUBY_PATCHLEVEL 263
+#define RUBY_PATCHLEVEL 264
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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