changes from personal modifies -- matz

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 15 insertions, 15 deletions

diff --git a/ext/tk/sample/tkbiff.rb b/ext/tk/sample/tkbiff.rb
index d2d7bf7be..ac2718443 100644
--- a/ext/tk/sample/tkbiff.rb
+++ b/ext/tk/sample/tkbiff.rb
@@ -38,11 +38,11 @@ class Mail
   def initialize(f)
     @header = {}
     @body = []
-    while f.gets()
-      $_.chop!
-      next if /^From /	# skip From-line  
-      break if /^$/		# end of header
-      if /^(\S+):\s*(.*)/
+    while line = f.gets()
+      line.chop!
+      next if /^From / =~ line	# skip From-line  
+      break if /^$/ =~ line	# end of header
+      if /^(\S+):\s*(.*)/ =~ line
 	@header[attr = $1.capitalize] = $2
       elsif attr
 	sub(/^\s*/, '')
@@ -50,10 +50,10 @@ class Mail
       end
     end
 
-    return if ! $_
+    return unless $_
 
-    while f.gets()
-      break if /^From /
+    while line = f.gets()
+      break if /^From / =~ line
       @body.push($_)
     end
   end
diff --git a/ext/tk/sample/tkfrom.rb b/ext/tk/sample/tkfrom.rb
index ba0e54779..8c3efb813 100644
--- a/ext/tk/sample/tkfrom.rb
+++ b/ext/tk/sample/tkfrom.rb
@@ -20,11 +20,11 @@ class Mail
   def initialize(f)
     @header = {}
     @body = []
-    while f.gets()
+    while line = f.gets()
       $_.chop!
-      next if /^From /		# skip From-line  
-      break if /^$/		# end of header
-      if /^(\S+):\s*(.*)/
+      next if /^From / =~ line	# skip From-line  
+      break if /^$/ =~ line	# end of header
+      if /^(\S+):\s*(.*)/ =~ line
 	@header[attr = $1.capitalize] = $2
       elsif attr
 	sub(/^\s*/, '')
@@ -32,10 +32,10 @@ class Mail
       end
     end
 
-    return if ! $_
+    return unless $_
 
-    while f.gets()
-      break if /^From /
+    while line = f.gets()
+      break if /^From / =~ line
       @body.push($_)
     end
   end