From d31315884c422fd68c263f692ec2fa2c9409776f Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 17 Jan 2013 03:51:21 +0000 Subject: [PATCH 1/2] Fix some blank line nits. --- cmd-choose-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index 24c42994..b274d561 100644 --- a/cmd-choose-tree.c +++ b/cmd-choose-tree.c @@ -219,6 +219,7 @@ windows_only: free(final_win_action); } + /* * If we're just drawing windows, don't consider moving on to * other sessions as we only list windows in this session. @@ -260,5 +261,4 @@ cmd_choose_tree_free(struct window_choose_data *cdata) free(cdata->command); format_free(cdata->ft); free(cdata); - } From 3a09e01a8e0e64f02ec054ca098da0bd8bbdf5dd Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 17 Jan 2013 20:30:43 +0000 Subject: [PATCH 2/2] Do not allow cursor colours to be set beginning with ? as that will report the colour, from Hayaki Saito. --- cmd-choose-client.c | 1 - input.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd-choose-client.c b/cmd-choose-client.c index 299fa3af..1f9741fe 100644 --- a/cmd-choose-client.c +++ b/cmd-choose-client.c @@ -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/input.c b/input.c index 7d26a661..e04ddc4f 100644 --- a/input.c +++ b/input.c @@ -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: