summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/cmd-choose-client.c3
-rw-r--r--usr.bin/tmux/input.c7
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-choose-client.c b/usr.bin/tmux/cmd-choose-client.c
index 31789b0f886..0590cba3589 100644
--- a/usr.bin/tmux/cmd-choose-client.c
+++ b/usr.bin/tmux/cmd-choose-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-choose-client.c,v 1.12 2012/08/14 08:51:53 nicm Exp $ */
+/* $OpenBSD: cmd-choose-client.c,v 1.13 2013/01/17 20:30:43 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,7 +44,6 @@ const struct cmd_entry cmd_choose_client_entry = {
struct cmd_choose_client_data {
struct client *client;
- char *template;
};
enum cmd_retval
diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c
index 9b0355c5bb9..6a93fe403ce 100644
--- a/usr.bin/tmux/input.c
+++ b/usr.bin/tmux/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.56 2013/01/15 23:18:55 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.57 2013/01/17 20:30:43 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1565,10 +1565,11 @@ input_exit_osc(struct input_ctx *ictx)
server_status_window(ictx->wp->window);
break;
case 12:
- screen_set_cursor_colour(ictx->ctx.s, p);
+ if (*p != '?') /* ? is colour request */
+ screen_set_cursor_colour(ictx->ctx.s, p);
break;
case 112:
- if (*p == '\0') /* No arguments allowed. */
+ if (*p == '\0') /* no arguments allowed */
screen_set_cursor_colour(ictx->ctx.s, "");
break;
default: