usa	2017-06-30 20:38:03 +0900 (Fri, 30 Jun 2017)

  New Revision: 59228

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59228

  Log:
    merge revision(s) 57530: [Backport #13191]
    
    sample/pty/shl.rb: update sample
    
    * Specify frozen_string_literal: true.
    * Fix TypeError of raise.
    * Use a character literal instead of Integer.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/sample/pty/shl.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/sample/pty/shl.rb
===================================================================
--- ruby_2_3/sample/pty/shl.rb	(revision 59227)
+++ ruby_2_3/sample/pty/shl.rb	(revision 59228)
@@ -1,3 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/sample/pty/shl.rb#L1
+# frozen_string_literal: true
 #
 #  old-fashioned 'shl' like program
 #  by A. Ito
@@ -22,15 +23,15 @@ def writer https://github.com/ruby/ruby/blob/trunk/ruby_2_3/sample/pty/shl.rb#L23
   begin
     while true
       c = STDIN.getc
-      if c == 26 then # C-z
-        $reader.raise(nil)
+      if c == ?\C-z then
+        $reader.raise('Suspend')
         return 'Suspend'
       end
       $w_pty.print c.chr
       $w_pty.flush
     end
   rescue
-    $reader.raise(nil)
+    $reader.raise('Exit')
     return 'Exit'
   ensure
     STDIN.cooked!
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 59227)
+++ ruby_2_3/version.h	(revision 59228)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 324
+#define RUBY_PATCHLEVEL 325
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 59227)
+++ ruby_2_3/ChangeLog	(revision 59228)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Jun 30 20:34:49 2017  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* sample/pty/shl.rb: update sample
+	  * Specify frozen_string_literal: true.
+	  * Fix TypeError of raise.
+	  * Use a character literal instead of Integer.
+
 Fri Jun 30 20:31:59 2017  Marcus Stollsteimer  <sto.mar@w...>
 
 	* string.c: [DOC] clarify docs for String#split when called with limit
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 59227)
+++ ruby_2_3	(revision 59228)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r57530

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