aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-11 05:47:18 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-11 05:47:18 +0000
commit748782bfc958f1ea0245cfc1fb1e893f7fe2f671 (patch)
treeefb8e9422e118a8e446ef262461b733eb3524702
parent5017259085e7a4147fc4e6465e5dfeefe9c48d26 (diff)
downloadruby-748782bfc958f1ea0245cfc1fb1e893f7fe2f671.tar.gz
* lib/irb/ruby-lex.rb (RubyLex#getc): revert r10817, which caused
regression for handling case when there is no newline at the end of file. [ruby-core:28248] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/irb/ruby-lex.rb1
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 234bfee16e..02001846b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Apr 11 14:44:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/irb/ruby-lex.rb (RubyLex#getc): revert r10817, which caused
+ regression for handling case when there is no newline at the end of
+ file. [ruby-core:28248]
+
Sun Apr 11 12:08:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_replicate): new encoding name must be valid
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 5a6c2894fb..37261bb79c 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -103,7 +103,6 @@ class RubyLex
@rests.push nil unless buf_input
end
c = @rests.shift
- return if c == nil
if @here_header
@here_readed.push c
else