ruby-changes:22147
From: kosaki <ko1@a...>
Date: Tue, 3 Jan 2012 14:02:55 +0900 (JST)
Subject: [ruby-changes:22147] kosaki:r34196 (ruby_1_9_3): merge revision(s) 34108:
kosaki 2012-01-03 13:54:20 +0900 (Tue, 03 Jan 2012) New Revision: 34196 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34196 Log: merge revision(s) 34108: * ext/readline/readline.c (Init_readline): libedit check rl_getc_function only when rl_initialize() is called, and using_history() call rl_initialize(). This assignment should be placed before using_history(). [ruby-core:40641] [Bug #5539] 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 34195) +++ ruby_1_9_3/ChangeLog (revision 34196) @@ -1,3 +1,10 @@ +Mon Jan 2 23:52:20 2012 TAKAO Kouji <kouji@t...> + + * ext/readline/readline.c (Init_readline): libedit check + rl_getc_function only when rl_initialize() is called, and + using_history() call rl_initialize(). This assignment should be + placed before using_history(). [ruby-core:40641] [Bug #5539] + Mon Jan 2 23:47:58 2012 Nobuyoshi Nakada <nobu@r...> * tool/rbinstall.rb (install_recursive, bin-comm): split mere Index: ruby_1_9_3/ext/readline/readline.c =================================================================== --- ruby_1_9_3/ext/readline/readline.c (revision 34195) +++ ruby_1_9_3/ext/readline/readline.c (revision 34196) @@ -1494,6 +1494,16 @@ /* Allow conditional parsing of the ~/.inputrc file. */ rl_readline_name = (char *)"Ruby"; +#if defined HAVE_RL_GETC_FUNCTION + /* libedit check rl_getc_function only when rl_initialize() is called, */ + /* and using_history() call rl_initialize(). */ + /* This assignment should be placed before using_history() */ + rl_getc_function = readline_getc; + id_getbyte = rb_intern_const("getbyte"); +#elif defined HAVE_RL_EVENT_HOOK + rl_event_hook = readline_event; +#endif + using_history(); completion_proc = rb_intern(COMPLETION_PROC); @@ -1633,12 +1643,6 @@ rb_define_const(mReadline, "VERSION", version); rl_attempted_completion_function = readline_attempted_completion_function; -#if defined HAVE_RL_GETC_FUNCTION - rl_getc_function = readline_getc; - id_getbyte = rb_intern_const("getbyte"); -#elif defined HAVE_RL_EVENT_HOOK - rl_event_hook = readline_event; -#endif #ifdef HAVE_RL_CATCH_SIGNALS rl_catch_signals = 0; #endif Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 34195) +++ ruby_1_9_3/version.h (revision 34196) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 16 +#define RUBY_PATCHLEVEL 17 #define RUBY_RELEASE_DATE "2012-01-03" #define RUBY_RELEASE_YEAR 2012 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/