mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2013-01-17 22:14:18 +00:00
parent 57ca428975 3a09e01a8e
commit 2ca8b7f359
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd-choose-client.c
View File

@@ -44,7 +44,6 @@ const struct cmd_entry cmd_choose_client_entry = {
struct cmd_choose_client_data { struct cmd_choose_client_data {
struct client *client; struct client *client;
char *template;
}; };
enum cmd_retval enum cmd_retval

2
cmd-choose-tree.c
View File

@@ -219,6 +219,7 @@ windows_only:
free(final_win_action); free(final_win_action);
} }
/* /*
* If we're just drawing windows, don't consider moving on to * If we're just drawing windows, don't consider moving on to
* other sessions as we only list windows in this session. * 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); free(cdata->command);
format_free(cdata->ft); format_free(cdata->ft);
free(cdata); free(cdata);
} }

5
input.c
View File

@@ -1565,10 +1565,11 @@ input_exit_osc(struct input_ctx *ictx)
server_status_window(ictx->wp->window); server_status_window(ictx->wp->window);
break; break;
case 12: case 12:
screen_set_cursor_colour(ictx->ctx.s, p); if (*p != '?') /* ? is colour request */
screen_set_cursor_colour(ictx->ctx.s, p);
break; break;
case 112: case 112:
if (*p == '\0') /* No arguments allowed. */ if (*p == '\0') /* no arguments allowed */
screen_set_cursor_colour(ictx->ctx.s, ""); screen_set_cursor_colour(ictx->ctx.s, "");
break; break;
default: default: