naruse	2012-02-17 11:47:10 +0900 (Fri, 17 Feb 2012)

  New Revision: 34655

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

  Log:
    merge revision(s) 34115:
    
    * test/readline/test_readline.rb (test_line_buffer__point): use
      lambda not to exit entire method by "return".  or "next" for
      proc.  [ruby-dev:45042] [Bug #5802]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/readline/test_readline.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34654)
+++ ruby_1_9_3/ChangeLog	(revision 34655)
@@ -1,3 +1,9 @@
+Fri Feb 17 11:46:39 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/readline/test_readline.rb (test_line_buffer__point): use
+	  lambda not to exit entire method by "return".  or "next" for
+	  proc.  [ruby-dev:45042] [Bug #5802]
+
 Fri Feb 17 10:15:54 2012  Tanaka Akira  <akr@f...>
 
 	* ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34654)
+++ ruby_1_9_3/version.h	(revision 34655)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 129
+#define RUBY_PATCHLEVEL 130
 
 #define RUBY_RELEASE_DATE "2012-02-17"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/readline/test_readline.rb
===================================================================
--- ruby_1_9_3/test/readline/test_readline.rb	(revision 34654)
+++ ruby_1_9_3/test/readline/test_readline.rb	(revision 34655)
@@ -129,22 +129,42 @@
         actual_text = nil
         actual_line_buffer = nil
         actual_point = nil
-        Readline.completion_proc = proc { |text|
+        Readline.completion_proc = ->(text) {
           actual_text = text
           actual_point = Readline.point
-          actual_buffer_line = Readline.line_buffer
+          actual_line_buffer = Readline.line_buffer
           stdin.write(" finish\n")
           stdin.close
           stdout.close
           return ["complete"]
         }
+
         stdin.write("first second\t")
         stdin.flush
+        Readline.completion_append_character = " "
         line = replace_stdio(stdin.path, stdout.path) {
           Readline.readline("> ", false)
         }
+        assert_equal("second", actual_text)
         assert_equal("first second", actual_line_buffer)
         assert_equal(12, actual_point)
+        assert_equal("first complete  finish", Readline.line_buffer)
+        assert_equal(Encoding.find("locale"), Readline.line_buffer.encoding)
+        assert_equal(true, Readline.line_buffer.tainted?)
+        assert_equal(22, Readline.point)
+
+        stdin.open
+        stdout.open
+
+        stdin.write("first second\t")
+        stdin.flush
+        Readline.completion_append_character = nil
+        line = replace_stdio(stdin.path, stdout.path) {
+          Readline.readline("> ", false)
+        }
+        assert_equal("second", actual_text)
+        assert_equal("first second", actual_line_buffer)
+        assert_equal(12, actual_point)
         assert_equal("first complete finish", Readline.line_buffer)
         assert_equal(Encoding.find("locale"), Readline.line_buffer.encoding)
         assert_equal(true, Readline.line_buffer.tainted?)

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