* 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 ruby#7397] [ruby-core:49561]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,9 @@
+Fri Feb  1 14:34:29 2013  Shugo Maeda  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* marshal.c (marshal_load): Add documentation warning against using

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 @@ def readline.have_macro(macro)
 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")

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