summaryrefslogtreecommitdiff
path: root/ext/readline
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-01 05:37:29 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-01 05:37:29 +0000
commit46ea3f65551e2467bdd4d6c8bd0c78644c955326 (patch)
treeb62d1d9d87224ec22ffafb09a020ce5404a99785 /ext/readline
parent8df20dd70b39f01ddd8521ceebbacf7488e3e056 (diff)
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/readline')
-rw-r--r--ext/readline/extconf.rb6
-rw-r--r--ext/readline/readline.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index c5db9b0..4920137 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 08b61fe..502e73e 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