Merge branch 'master' into next

diff --combined lib/sup/textfield.rb
index b8dec59d368af5508ee85b40ae78a3dade452f83,f52aa821d3b7ef540dfe2509bba2b998142129a6..76803bf97c9a00bc394a6f9e59c4f26b6b318b9e
--- 1/lib/sup/textfield.rb
--- 2/lib/sup/textfield.rb
+++ b/lib/sup/textfield.rb
@@@ -35,9 -35,9 +35,9 @@@ class TextFiel
      @completion_block = block
      @field = Ncurses::Form.new_field 1, @width - question.length, @y, @x + question.length, 256, 0
      @form = Ncurses::Form.new_form [@field]
-     @value = default
+     @value = default || ''
      Ncurses::Form.post_form @form
-     set_cursed_value default if default
+     set_cursed_value @value
    end
  
    def position_cursor
@@@ -112,11 -112,11 +112,11 @@@
          unless @history.empty?
            value = get_cursed_value
            @i ||= @history.size
 -          #Redwood::log "history before #{@history.inspect}"
 +          #debug "history before #{@history.inspect}"
            @history[@i] = value #unless value =~ /^\s*$/
            @i = (@i + (c == Ncurses::KEY_UP ? -1 : 1)) % @history.size
            @value = @history[@i]
 -          #Redwood::log "history after #{@history.inspect}"
 +          #debug "history after #{@history.inspect}"
            set_cursed_value @value
            Ncurses::Form::REQ_END_FIELD
          end