nagachika	2017-07-23 16:50:10 +0900 (Sun, 23 Jul 2017)

  New Revision: 59404

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

  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_4/
  Modified files:
    branches/ruby_2_4/sample/pty/shl.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/sample/pty/shl.rb
===================================================================
--- ruby_2_4/sample/pty/shl.rb	(revision 59403)
+++ ruby_2_4/sample/pty/shl.rb	(revision 59404)
@@ -1,3 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/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_4/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_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 59403)
+++ ruby_2_4/version.h	(revision 59404)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-07-23"
-#define RUBY_PATCHLEVEL 155
+#define RUBY_PATCHLEVEL 156
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 7
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 59403)
+++ ruby_2_4	(revision 59404)

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

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