naruse	2012-02-08 10:35:23 +0900 (Wed, 08 Feb 2012)

  New Revision: 34471

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

  Log:
    merge revision(s) 34109:
    
    * ext/readline/readline.c (readline_attempted_completion_function):
      in Readline module with GNU Readline 6 case, Readline module
      resets completion_append_character to " ", after it executes
      completion. So, Readline module stores
      completion_append_character, and Readline module always sets it
      after Readline module executes completion. [ruby-dev:43456]
      [Feature #4635]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/readline/readline.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34470)
+++ ruby_1_9_3/ChangeLog	(revision 34471)
@@ -1,3 +1,13 @@
+Wed Feb  8 10:34:59 2012  TAKAO Kouji  <kouji@t...>
+
+	* ext/readline/readline.c (readline_attempted_completion_function):
+	  in Readline module with GNU Readline 6 case, Readline module
+	  resets completion_append_character to " ", after it executes
+	  completion. So, Readline module stores
+	  completion_append_character, and Readline module always sets it
+	  after Readline module executes completion. [ruby-dev:43456]
+	  [Feature #4635]
+
 Wed Feb  8 09:47:52 2012  Tanaka Akira  <akr@f...>
 
 	* test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too
Index: ruby_1_9_3/ext/readline/readline.c
===================================================================
--- ruby_1_9_3/ext/readline/readline.c	(revision 34470)
+++ ruby_1_9_3/ext/readline/readline.c	(revision 34471)
@@ -69,6 +69,9 @@
 #endif
 
 static int (*history_get_offset_func)(int);
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+static int readline_completion_append_character;
+#endif
 
 static char **readline_attempted_completion_function(const char *text,
                                                      int start, int end);
@@ -257,6 +260,9 @@
 static VALUE
 readline_get(VALUE prompt)
 {
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+    readline_completion_append_character = rl_completion_append_character;
+#endif
     return (VALUE)readline((char *)prompt);
 }
 
@@ -641,6 +647,9 @@
     proc = rb_attr_get(mReadline, completion_proc);
     if (NIL_P(proc))
 	return NULL;
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+    rl_completion_append_character = readline_completion_append_character;
+#endif
 #ifdef HAVE_RL_ATTEMPTED_COMPLETION_OVER
     rl_attempted_completion_over = 1;
 #endif
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34470)
+++ ruby_1_9_3/version.h	(revision 34471)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 54
+#define RUBY_PATCHLEVEL 55
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012

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