diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-19 03:39:57 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-19 03:39:57 +0000 |
| commit | d02ec1c68606ca3a355a29960a622d0b6bded56f (patch) | |
| tree | 05edc348177e81582eb28e44c77b18f2acb4a365 | |
| parent | b33c28868386168d859989437cad6b8a3ced0ecb (diff) | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | ext/readline/extconf.rb | 3 | ||||
| -rw-r--r-- | ext/readline/readline.c | 6 |
3 files changed, 22 insertions, 4 deletions
@@ -1,7 +1,16 @@ +Fri Feb 19 12:15:21 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@fsij.org> * pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'. - + Tue Feb 16 20:56:39 2010 Tanaka Akira <akr@fsij.org> * file.c (rb_group_member): renamed from group_member. @@ -40,7 +49,7 @@ Thu Feb 11 09:37:01 2010 Tanaka Akira <akr@fsij.org> * lib/resolv.rb: support :nameserver_port option. backport r26230 and r26357 from 1.9. - + Wed Feb 10 13:03:29 2010 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_times): backport r15514 to reduce loop @@ -757,14 +766,14 @@ Tue Oct 6 06:26:00 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * 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@ruby-lang.org> * 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@ruby-lang.org> diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index 3f5c6474d6..2d559d92d5 100644 --- a/ext/readline/extconf.rb +++ b/ext/readline/extconf.rb @@ -59,6 +59,9 @@ have_readline_var("rl_filename_quote_characters") 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") diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 6566507b8f..a688e6de4d 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -833,6 +833,12 @@ Init_readline() #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 |