summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlib/highline.rb4
-rw-r--r--lib/highline/wrapper.rb3
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/highline.rb b/lib/highline.rb
index 4dcdd00..e76c49d 100755
--- a/lib/highline.rb
+++ b/lib/highline.rb
@@ -535,7 +535,9 @@ class HighLine
line = ""
terminal.raw_no_echo_mode_exec do
- while character = terminal.get_character
+ loop do
+ character = terminal.get_character
+ break unless character
break if ["\n", "\r"].include? character
# honor backspace and delete
diff --git a/lib/highline/wrapper.rb b/lib/highline/wrapper.rb
index 4b17666..a2ab4ac 100644
--- a/lib/highline/wrapper.rb
+++ b/lib/highline/wrapper.rb
@@ -25,7 +25,8 @@ class HighLine
while line =~ /([^\n]{#{wrap_at + 1},})/
search = Regexp.last_match(1).dup
replace = Regexp.last_match(1).dup
- if index = replace.rindex(" ", wrap_at)
+ index = replace.rindex(" ", wrap_at)
+ if index
replace[index, 1] = "\n"
replace.sub!(/\n[ \t]+/, "\n")
line.sub!(search, replace)