diff options
| author | Thomas Adam <thomas@xteddy.org> | 2013-01-17 22:14:18 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2013-01-17 22:14:18 +0000 |
| commit | 2ca8b7f3593ec5a88c9f56a43f5076800957a0db (patch) | |
| tree | 5fde002fa09c9fe26098766fa581f88d050fff90 | |
| parent | 57ca4289759a438829aa79149f152ec46533e258 (diff) | |
| parent | 3a09e01a8e0e64f02ec054ca098da0bd8bbdf5dd (diff) | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-choose-client.c | 1 | ||||
| -rw-r--r-- | cmd-choose-tree.c | 2 | ||||
| -rw-r--r-- | input.c | 5 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd-choose-client.c b/cmd-choose-client.c index 7c3b926a..75ef8f2c 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/cmd-choose-tree.c b/cmd-choose-tree.c index 4432ff7e..cf0b772a 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); - } @@ -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: |