=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- src/usr.bin/tmux/screen-write.c 2009/11/26 21:37:13 1.40 +++ src/usr.bin/tmux/screen-write.c 2009/12/03 22:50:10 1.41 @@ -1,4 +1,4 @@ -/* $OpenBSD: screen-write.c,v 1.40 2009/11/26 21:37:13 nicm Exp $ */ +/* $OpenBSD: screen-write.c,v 1.41 2009/12/03 22:50:10 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -183,7 +183,7 @@ break; } size += utf8data.width; - + gc->flags |= GRID_FLAG_UTF8; screen_write_cell(ctx, gc, &utf8data); gc->flags &= ~GRID_FLAG_UTF8; @@ -376,7 +376,7 @@ bx = gl->cellsize; else bx = px + nx; - + for (xx = ax; xx < bx; xx++) { if (xx >= gl->cellsize) gc = &grid_default_cell; @@ -646,7 +646,7 @@ ny = s->rlower + 1 - s->cy; if (ny == 0) return; - + screen_write_initctx(ctx, &ttyctx, 0); if (s->cy < s->rupper || s->cy > s->rlower) @@ -682,7 +682,7 @@ tty_write(tty_cmd_deleteline, &ttyctx); return; } - + if (ny > s->rlower + 1 - s->cy) ny = s->rlower + 1 - s->cy; if (ny == 0) @@ -728,7 +728,7 @@ if (s->cx <= sx - 1) grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1); - tty_write(tty_cmd_clearendofline, &ttyctx); + tty_write(tty_cmd_clearendofline, &ttyctx); } /* Clear to start of line from cursor. */ @@ -863,7 +863,7 @@ s->cy++; ttyctx.num = wrapped; - tty_write(tty_cmd_linefeed, &ttyctx); + tty_write(tty_cmd_linefeed, &ttyctx); } /* Carriage return (cursor to start of line). */ @@ -988,7 +988,7 @@ /* * If the width is zero, combine onto the previous character, if - * there is space. + * there is space. */ if (width == 0) { if (screen_write_combine(ctx, utf8data) == 0) {