diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:54:20 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:54:20 +0000 |
| commit | 0239882c8147e89ce5b6c6d39786804fb12343ea (patch) | |
| tree | 4991d3838b6bde51d25e4d67d2162f9f9398938b | |
| parent | 379a35b87083b8e66f546824b7634ffd7eee9a94 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/readline/readline.c | 16 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,10 @@ +Mon Jan 2 23:52:20 2012 TAKAO Kouji <kouji@takao7.net> + + * 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@ruby-lang.org> * tool/rbinstall.rb (install_recursive, bin-comm): split mere diff --git a/ext/readline/readline.c b/ext/readline/readline.c index c035b67c54..6b7dbc2cbb 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1494,6 +1494,16 @@ Init_readline() /* 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 @@ Init_readline() 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 @@ -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 |