shugo	2013-02-01 14:37:29 +0900 (Fri, 01 Feb 2013)

  New Revision: 39002

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39002

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/ext/readline/extconf.rb
    trunk/ext/readline/readline.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39001)
+++ ChangeLog	(revision 39002)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Feb  1 14:34:29 2013  Shugo Maeda  <shugo@r...>
+
+	* 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@c...>
 
 	* marshal.c (marshal_load): Add documentation warning against using
Index: ext/readline/readline.c
===================================================================
--- ext/readline/readline.c	(revision 39001)
+++ ext/readline/readline.c	(revision 39002)
@@ -48,7 +48,7 @@ static VALUE mReadline; https://github.com/ruby/ruby/blob/trunk/ext/readline/readline.c#L48
 
 #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
Index: ext/readline/extconf.rb
===================================================================
--- ext/readline/extconf.rb	(revision 39001)
+++ ext/readline/extconf.rb	(revision 39002)
@@ -19,10 +19,6 @@ def readline.have_func(func) https://github.com/ruby/ruby/blob/trunk/ext/readline/extconf.rb#L19
   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") https://github.com/ruby/ruby/blob/trunk/ext/readline/extconf.rb#L93
 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")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/