diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | ext/readline/readline.c | 9 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Wed Feb 8 10:34:59 2012 TAKAO Kouji <kouji@takao7.net> + + * ext/readline/readline.c (readline_attempted_completion_function): + in Readline module with GNU Readline 6 case, Readline module + resets completion_append_character to " ", after it executes + completion. So, Readline module stores + completion_append_character, and Readline module always sets it + after Readline module executes completion. [ruby-dev:43456] + [Feature #4635] + Wed Feb 8 09:47:52 2012 Tanaka Akira <akr@fsij.org> * test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 6b7dbc2cbb..68ff07dc0d 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -69,6 +69,9 @@ static ID id_orig_prompt, id_last_prompt; #endif static int (*history_get_offset_func)(int); +#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER +static int readline_completion_append_character; +#endif static char **readline_attempted_completion_function(const char *text, int start, int end); @@ -257,6 +260,9 @@ insert_ignore_escape(VALUE self, VALUE prompt) static VALUE readline_get(VALUE prompt) { +#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + readline_completion_append_character = rl_completion_append_character; +#endif return (VALUE)readline((char *)prompt); } @@ -641,6 +647,9 @@ readline_attempted_completion_function(const char *text, int start, int end) proc = rb_attr_get(mReadline, completion_proc); if (NIL_P(proc)) return NULL; +#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + rl_completion_append_character = readline_completion_append_character; +#endif #ifdef HAVE_RL_ATTEMPTED_COMPLETION_OVER rl_attempted_completion_over = 1; #endif @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 54 +#define RUBY_PATCHLEVEL 55 #define RUBY_RELEASE_DATE "2012-02-08" #define RUBY_RELEASE_YEAR 2012 |