1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE

and RL_PROMPT_END_IGNORE. [ruby-core:34331]

* ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
  RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
  error with libedit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-01-12 07:26:15 +00:00
parent 596872f21d
commit 6c97778618
3 changed files with 16 additions and 1 deletions

View file

@ -1,3 +1,12 @@
Wed Jan 12 16:24:53 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE
and RL_PROMPT_END_IGNORE. [ruby-core:34331]
* ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
error with libedit.
Wed Jan 12 15:53:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* README.EXT.ja (rb_ensure): typo.

View file

@ -19,6 +19,10 @@ def have_readline_func(func)
return have_func(func, $readline_headers)
end
def have_readline_macro(macro)
return have_macro(macro, $readline_headers)
end
dir_config('curses')
dir_config('ncurses')
dir_config('termcap')
@ -79,4 +83,6 @@ have_readline_func("rl_emacs_editing_mode")
have_readline_func("replace_history_entry")
have_readline_func("remove_history")
have_readline_func("clear_history")
have_readline_macro("RL_PROMPT_START_IGNORE")
have_readline_macro("RL_PROMPT_END_IGNORE")
create_makefile("readline")

View file

@ -44,7 +44,7 @@ static VALUE mReadline;
#define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper"
#ifndef USE_INSERT_IGNORE_ESCAPE
# ifndef HAVE_EDITLINE_READLINE_H
# if !defined(HAVE_EDITLINE_READLINE_H) && defined(HAVE_RL_PROMPT_START_IGNORE) && defined(HAVE_RL_PROMPT_END_IGNORE)
# define USE_INSERT_IGNORE_ESCAPE 1
# else
# define USE_INSERT_IGNORE_ESCAPE 0