clean up some minor conflict mis-resolutions

diff --git a/bin/sup b/bin/sup
index 5d651be5ce83175192a333f19aa9551e64e28a7e..317857d26fcae32c335b3855c743048ebd353887 100755 (executable)
--- a/bin/sup
+++ b/bin/sup
@@ -213,7 +213,7 @@ begin
 
     if c.nil?
       if BufferManager.sigwinch_happened?
-        Redwood::log "redrawing screen on sigwinch"
+        debug "redrawing screen on sigwinch"
         BufferManager.completely_redraw_screen
       end
       next

diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb
index e1d1bc6f0e374d986402880cecb47a4a6ff00b95..be2d1bba5d5bfb267c44a60a03dcfdc919ceb92e 100644 (file)
--- a/lib/sup/buffer.rb
+++ b/lib/sup/buffer.rb
@@ -271,7 +271,7 @@ EOS
     Ncurses.stdscr.keypad 1
     Ncurses.refresh
     @sigwinch_mutex.synchronize { @sigwinch_happened = false }
-    Redwood::log "new screen size is #{Ncurses.rows} x #{Ncurses.cols}"
+    debug "new screen size is #{Ncurses.rows} x #{Ncurses.cols}"
 
     status, title = get_status_and_title(@focus_buf) # must be called outside of the ncurses lock