Permalink
Browse files

Merge branch 'master' into jline

  • Loading branch information...
2 parents 8a53b83 + b11829d commit 91af27919e5909d18bd903fb2eba377c10f1b943 Thomas Dudziak committed Nov 28, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −0 CHANGELOG
  2. +0 −1 lib/highline/system_extensions.rb
View
1 CHANGELOG
@@ -6,6 +6,7 @@ Below is a complete listing of changes for each revision of HighLine.
* The new list modes now properly ignore escapes when sizing.
* Added a project gemspec file.
+* Fixed a bug that prevented the use of termios (by tomdz).
== 1.6.8
View
1 lib/highline/system_extensions.rb
@@ -61,7 +61,6 @@ def terminal_size
end
rescue LoadError # If we're not on Windows try...
begin
- raise LoadError
require "termios" # Unix, first choice termios.
CHARACTER_MODE = "termios" # For Debugging purposes only.

0 comments on commit 91af279

Please sign in to comment.