From b8e616f44555ac74f652375af76da2689afa9147 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Thu, 3 Jan 2008 20:01:47 +0000
Subject: [PATCH] This was wrong...

---
 screen-redraw.c | 4 ++--
 status.c        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/screen-redraw.c b/screen-redraw.c
index 6f8c1f20..a386b9b0 100644
--- a/screen-redraw.c
+++ b/screen-redraw.c
@@ -1,4 +1,4 @@
-/* $Id: screen-redraw.c,v 1.2 2008-01-03 19:18:14 nicm Exp $ */
+/* $Id: screen-redraw.c,v 1.3 2008-01-03 20:01:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -138,7 +138,7 @@ screen_redraw_write_string(struct screen_redraw_ctx *ctx, const char *fmt, ...)
 	va_end(ap);
 
 	for (ptr = msg; *ptr != '\0'; ptr++) {
-		if (ctx->s->cx > screen_size_x(s))
+		if (ctx->s->cx > screen_last_x(s))
 			break;
 		if (*ptr < 0x20)
 			continue;
diff --git a/status.c b/status.c
index 8d0f778b..8847e2d9 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.16 2008-01-03 19:18:14 nicm Exp $ */
+/* $Id: status.c,v 1.17 2008-01-03 20:01:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -49,7 +49,7 @@ status_write_client(struct client *c)
 		screen_redraw_write_string(
 		    &ctx, "%d:%s%c ", wl->idx, wl->window->name, flag);
 
-		if (ctx.s->cx > screen_size_x(ctx.s))
+		if (ctx.s->cx > screen_last_x(ctx.s))
 			break;
 	}
 	screen_redraw_clear_end_of_line(&ctx);