Merge branch 'obsd-master'

Conflicts:
	Makefile
	tty-keys.c

1 files changed, 0 insertions, 3 deletions

diff --git a/status.c b/status.c
index e8bbf4c1..af9dd7bc 100644
--- a/status.c
+++ b/status.c
@@ -396,9 +396,6 @@ status_replace1(struct client *c, char **iptr, char **optr, char *out,
 	case '{':
 		ptr = (char *) "#{";
 		goto do_replace;
-	case '#':
-		*(*optr)++ = '#';
-		break;
 	default:
 		xsnprintf(tmp, sizeof tmp, "#%c", *(*iptr - 1));
 		ptr = tmp;