yugui	2011-01-12 16:26:15 +0900 (Wed, 12 Jan 2011)

  New Revision: 30519

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

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

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30518)
+++ ChangeLog	(revision 30519)
@@ -1,3 +1,12 @@
+Wed Jan 12 16:24:53 2011  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* 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@r...>
 
 	* README.EXT.ja (rb_ensure): typo.
Index: ext/readline/readline.c
===================================================================
--- ext/readline/readline.c	(revision 30518)
+++ ext/readline/readline.c	(revision 30519)
@@ -44,7 +44,7 @@
 
 #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
Index: ext/readline/extconf.rb
===================================================================
--- ext/readline/extconf.rb	(revision 30518)
+++ ext/readline/extconf.rb	(revision 30519)
@@ -19,6 +19,10 @@
   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("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")

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