naruse	2010-02-19 12:39:57 +0900 (Fri, 19 Feb 2010)

  New Revision: 26712

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

  Log:
    * 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.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/readline/extconf.rb
    branches/ruby_1_8/ext/readline/readline.c

Index: ruby_1_8/ext/readline/readline.c
===================================================================
--- ruby_1_8/ext/readline/readline.c	(revision 26711)
+++ ruby_1_8/ext/readline/readline.c	(revision 26712)
@@ -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/ext/readline/extconf.rb
===================================================================
--- ruby_1_8/ext/readline/extconf.rb	(revision 26711)
+++ ruby_1_8/ext/readline/extconf.rb	(revision 26712)
@@ -59,6 +59,9 @@
 have_readline_var("rl_attempted_completion_over")
 have_readline_var("rl_library_version")
 have_readline_var("rl_event_hook")
+# workaround for native windows.
+/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_sigwinch")
+/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_catch_signals")
 have_readline_func("rl_cleanup_after_signal")
 have_readline_func("rl_clear_signals")
 have_readline_func("rl_vi_editing_mode")
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26711)
+++ ruby_1_8/ChangeLog	(revision 26712)
@@ -1,7 +1,16 @@
+Fri Feb 19 12:15:21 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.
+
 Fri Feb 19 00:23:24 2010  Tanaka Akira  <akr@f...>
 
 	* pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'.
-	
+
 Tue Feb 16 20:56:39 2010  Tanaka Akira  <akr@f...>
 
 	* file.c (rb_group_member): renamed from group_member.
@@ -40,7 +49,7 @@
 
 	* lib/resolv.rb: support :nameserver_port option.  backport r26230
 	  and r26357 from 1.9.
-	
+
 Wed Feb 10 13:03:29 2010  Yukihiro Matsumoto  <matz@r...>
 
 	* string.c (rb_str_times): backport r15514 to reduce loop
@@ -757,14 +766,14 @@
 
 	* ext/tk/lib/tkextlib/vu/dial.rb: fix logical bug.
 
-	* ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb: 
+	* ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb:
 	  lack of support for methodcall_optkeys.
 
 Sun Oct  4 22:44:03 2009  Takeyuki FUJIOKA  <xibbar@r...>
 
 	* 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]
 
 Sun Oct  4 19:30:54 2009  Nobuyoshi Nakada  <nobu@r...>
 

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