kouji	2011-12-23 16:02:42 +0900 (Fri, 23 Dec 2011)

  New Revision: 34108

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

  Log:
    * ext/readline/readline.c (Init_readline): libedit check
      rl_getc_function only when rl_initialize() is called, and
      using_history() call rl_initialize(). This assignment should be
      placed before using_history(). [ruby-core:40641] [Bug #5539]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34107)
+++ ChangeLog	(revision 34108)
@@ -1,3 +1,10 @@
+Fri Dec 23 15:59:05 2011  TAKAO Kouji  <kouji@t...>
+
+	* ext/readline/readline.c (Init_readline): libedit check
+	  rl_getc_function only when rl_initialize() is called, and
+	  using_history() call rl_initialize(). This assignment should be
+	  placed before using_history(). [ruby-core:40641] [Bug #5539]
+
 Fri Dec 23 10:14:47 2011  Tanaka Akira  <akr@f...>
 
 	* test/thread/test_queue.rb (test_thr_kill): show the number of loop
Index: ext/readline/readline.c
===================================================================
--- ext/readline/readline.c	(revision 34107)
+++ ext/readline/readline.c	(revision 34108)
@@ -1495,6 +1495,16 @@
     /* Allow conditional parsing of the ~/.inputrc file. */
     rl_readline_name = (char *)"Ruby";
 
+#if defined HAVE_RL_GETC_FUNCTION
+    /* libedit check rl_getc_function only when rl_initialize() is called, */
+    /* and using_history() call rl_initialize(). */
+    /* This assignment should be placed before using_history() */
+    rl_getc_function = readline_getc;
+    id_getbyte = rb_intern_const("getbyte");
+#elif defined HAVE_RL_EVENT_HOOK
+    rl_event_hook = readline_event;
+#endif
+
     using_history();
 
     completion_proc = rb_intern(COMPLETION_PROC);
@@ -1640,12 +1650,6 @@
     rb_define_const(mReadline, "VERSION", version);
 
     rl_attempted_completion_function = readline_attempted_completion_function;
-#if defined HAVE_RL_GETC_FUNCTION
-    rl_getc_function = readline_getc;
-    id_getbyte = rb_intern_const("getbyte");
-#elif defined HAVE_RL_EVENT_HOOK
-    rl_event_hook = readline_event;
-#endif
 #ifdef HAVE_RL_CATCH_SIGNALS
     rl_catch_signals = 0;
 #endif

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