commit 81ee8d587ed713ebef29c1e450f5bc2557119c07
parent 631981cbbb728c0bfd62d91a89129169a8a6d2e1
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 17 Aug 2009 13:32:57 -0700
clean up some minor conflict mis-resolutions
Diffstat:
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
@@ -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