diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/readline/extconf.rb | 6 | ||||
| -rw-r--r-- | ext/readline/readline.c | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Fri Feb 1 14:34:29 2013 Shugo Maeda <shugo@ruby-lang.org> + + * ext/readline/extconf.rb, ext/readline/readline.c: check + RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE directly in + readline.c. Patch by Zachary Scott. [Bug #7397] [ruby-core:49561] + Thu Jan 31 21:55:00 2013 Charlie Somerville <charlie@charliesomerville.com> * marshal.c (marshal_load): Add documentation warning against using diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb index c5db9b029a..4920137bf1 100644 --- a/ext/readline/extconf.rb +++ b/ext/readline/extconf.rb @@ -19,10 +19,6 @@ def readline.have_func(func) return super(func, headers) end -def readline.have_macro(macro) - return super(macro, headers) -end - dir_config('curses') dir_config('ncurses') dir_config('termcap') @@ -97,6 +93,4 @@ readline.have_func("remove_history") readline.have_func("clear_history") readline.have_func("rl_redisplay") readline.have_func("rl_insert_text") -readline.have_macro("RL_PROMPT_START_IGNORE") -readline.have_macro("RL_PROMPT_END_IGNORE") create_makefile("readline") diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 08b61fef9d..502e73e5c8 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -48,7 +48,7 @@ static VALUE mReadline; #define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper" #ifndef USE_INSERT_IGNORE_ESCAPE -# if !defined(HAVE_EDITLINE_READLINE_H) && defined(HAVE_RL_PROMPT_START_IGNORE) && defined(HAVE_RL_PROMPT_END_IGNORE) +# if !defined(HAVE_EDITLINE_READLINE_H) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE) # define USE_INSERT_IGNORE_ESCAPE 1 # else # define USE_INSERT_IGNORE_ESCAPE 0 |