summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 15:36:57 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 15:36:57 +0000
commita597ab25d7e6c9f2480359128c380efdf58e40a5 (patch)
tree99526db513304407738b7c2b38803e12ce15eea8
parent336f996842cb9006363a69c12b75e2d99e978eae (diff)
merges r21485 from trunk into ruby_1_9_1.
* lib/irb/input-method.rb: IRB did not prompt for MSwin32. [ruby-dev:37686]. Patch by arton <artonx AT yahoo.co.jp>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/irb/input-method.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fc314051ca..5b4ef619d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 13 11:58:04 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * lib/irb/input-method.rb: IRB did not prompt for MSwin32.
+ [ruby-dev:37686].
+ Patch by arton <artonx AT yahoo.co.jp>.
+
Tue Jan 13 12:10:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index 407012aa86..0b22d9ca74 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -45,7 +45,7 @@ module IRB
@line_no = 0
@line = []
@stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
- @stdout = IO.open(STDOUT.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+ @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
end
def gets
@@ -106,7 +106,7 @@ module IRB
@eof = false
@stdin = IO.open(STDIN.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
- @stdout = IO.open(STDOUT.to_i, :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
+ @stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
end
def gets