Merge branch 'master' into next

[sup] / lib / sup / mode.rb

diff --git a/lib/sup/mode.rb b/lib/sup/mode.rb
index bea46d92d425835142f2ae3b94eca035b0a64148..03deacb53b01ee145c0bf4325b9c347056950578 100644 (file)
--- a/lib/sup/mode.rb
+++ b/lib/sup/mode.rb
@@ -1,3 +1,4 @@
+require 'open3'
 module Redwood
 
 class Mode
@@ -58,7 +59,7 @@ class Mode
       title = "Keybindings from #{Mode.make_name klass.name}"
       s = <<EOS
 #{title}
-#{'-' * title.length}
+#{'-' * title.display_length}
 
 #{km.help_text used_keys}
 EOS
@@ -92,10 +93,10 @@ EOS
       unless err.empty?
         message = err.first.read
         if message =~ /^\s*$/
-          Redwood::log "error running #{command} (but no error message)"
+          warn "error running #{command} (but no error message)"
           BufferManager.flash "Error running #{command}!"
         else
-          Redwood::log "error running #{command}: #{message}"
+          warn "error running #{command}: #{message}"
           BufferManager.flash "Error: #{message}"
         end
         return