Merge branch 'ncurses-fixes' into next

diff --combined bin/sup
index 0e2260c210fd609feb1584f85a8300e0889b3952,b87c11223342aefe977b34e99f053ba548a4fc6d..e4351c3621ef8b3a16a43e420786653f1206feed
--- 1/bin/sup
--- 2/bin/sup
+++ b/bin/sup
@@@ -160,7 -160,7 +160,7 @@@ begi
    Redwood::start
    Index.load
  
-   trap("TERM") { |x| raise "so speaking as i think, i die, i die!" }
+   trap("TERM") { |x| SuicideManager.please_die! }
    trap("WINCH") { |x| BufferManager.sigwinch_happened! }
  
    if(s = Redwood::SourceManager.source_for DraftManager.source_name)
@@@ -245,16 -245,15 +245,16 @@@
  
      bm.erase_flash
  
 -    action = begin
 -      if bm.handle_input c
 +    action =
 +      begin
 +        if bm.handle_input c
 +          :nothing
 +        else
 +          bm.resolve_input_with_keymap c, global_keymap
 +        end
 +      rescue InputSequenceAborted
          :nothing
 -      else
 -        bm.resolve_input_with_keymap c, global_keymap
        end
 -    rescue InputSequenceAborted
 -      :nothing
 -    end
      case action
      when :quit_now
        break if bm.kill_all_buffers_safely