===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- src/usr.bin/tmux/status.c	2009/08/31 20:46:19	1.28
+++ src/usr.bin/tmux/status.c	2009/09/01 09:11:05	1.29
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.28 2009/08/31 20:46:19 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.29 2009/09/01 09:11:05 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -690,7 +690,7 @@
 	struct screen_write_ctx	ctx;
 	struct session		       *s = c->session;
 	struct screen		        old_status;
-	size_t			        i, size, left, len, off, n;
+	size_t			        i, size, left, len, off;
 	char				ch;
 	struct grid_cell		gc;
 
@@ -724,13 +724,9 @@
 				left--;
 			size = left;
 		}
-		if (c->prompt_flags & PROMPT_HIDDEN) {
-			n = strlen(c->prompt_buffer);
-			if (n > left)
-				n = left;
-			for (i = 0; i < n; i++)
-				screen_write_putc(&ctx, &gc, '*');
-		} else {
+		if (c->prompt_flags & PROMPT_HIDDEN)
+			size = 0;
+		else {
 			screen_write_puts(&ctx, &gc,
 			    "%.*s", (int) left, c->prompt_buffer + off);
 		}
@@ -739,17 +735,15 @@
 			screen_write_putc(&ctx, &gc, ' ');
 
 		/* Draw a fake cursor. */
-		screen_write_cursormove(&ctx, len + c->prompt_index - off, 0);
-		if (c->prompt_index == strlen(c->prompt_buffer))
-			ch = ' ';
+		ch = ' ';
+		if (c->prompt_flags & PROMPT_HIDDEN)
+			screen_write_cursormove(&ctx, len, 0);
 		else {
-			if (c->prompt_flags & PROMPT_HIDDEN)
-				ch = '*';
-			else
+			screen_write_cursormove(&ctx,
+			    len + c->prompt_index - off, 0);
+			if (c->prompt_index < strlen(c->prompt_buffer))
 				ch = c->prompt_buffer[c->prompt_index];
 		}
-		if (ch == '\0')
-			ch = ' ';
 		gc.attr ^= GRID_ATTR_REVERSE;
 		screen_write_putc(&ctx, &gc, ch);
 	}