extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-01-14 09:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

Browse Source 
Conflicts:
	cmd-split-window.c
	cmd-unbind-key.c
	format.c
	osdep-openbsd.c
This commit is contained in:
Nicholas Marriott 2013-10-11 16:52:39 +01:00
commit 8bcdd8fc21
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd-unbind-key.c
View File

@ -50,7 +50,6 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
cmdq_error(cmdq, "missing key"); cmdq_error(cmdq, "missing key");
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
return (CMD_RETURN_ERROR);
key = key_string_lookup_string(args->argv[0]); key = key_string_lookup_string(args->argv[0]);
if (key == KEYC_NONE) { if (key == KEYC_NONE) {
cmdq_error(cmdq, "unknown key: %s", args->argv[0]); cmdq_error(cmdq, "unknown key: %s", args->argv[0]);

17
format.c
View File

@ -353,15 +353,20 @@ format_expand(struct format_tree *ft, const char *fmt)
char * char *
format_get_command(struct window_pane *wp) format_get_command(struct window_pane *wp)
{ {
char *cmd; char *cmd, *out;
cmd = osdep_get_name(wp->fd, wp->tty); cmd = osdep_get_name(wp->fd, wp->tty);
if (cmd == NULL || *cmd == '\0') { if (cmd == NULL || *cmd == '\0') {
cmd = wp->cmd; free(cmd);
if (cmd == NULL || *cmd == '\0') cmd = xstrdup(wp->cmd);
cmd = wp->shell; if (cmd == NULL || *cmd == '\0') {
free(cmd);
cmd = xstrdup(wp->shell);
}
} }
return (parse_window_name(cmd)); out = parse_window_name(cmd);
free(cmd);
return (out);
} }
/* Set default format keys for a session. */ /* Set default format keys for a session. */
@ -518,7 +523,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
struct grid_line *gl; struct grid_line *gl;
unsigned long long size; unsigned long long size;
u_int i, idx; u_int i, idx;
const char *cwd; const char *cmd;
char *cmd; char *cmd;
size = 0; size = 0;

2
server-client.c
View File

@ -808,6 +808,8 @@ server_client_msg_dispatch(struct client *c)
if (imsg.hdr.peerid != PROTOCOL_VERSION) { if (imsg.hdr.peerid != PROTOCOL_VERSION) {
server_write_client(c, MSG_VERSION, NULL, 0); server_write_client(c, MSG_VERSION, NULL, 0);
c->flags |= CLIENT_BAD; c->flags |= CLIENT_BAD;
if (imsg.fd != -1)
close(imsg.fd);
imsg_free(&imsg); imsg_free(&imsg);
continue; continue;
} }

6
tmux.1
View File

@ -2738,8 +2738,8 @@ instead redraw it entirely every
.Ar interval .Ar interval
milliseconds. milliseconds.
This helps to prevent fast output (such as This helps to prevent fast output (such as
.Xr yes 1 .Xr yes 1 )
overwhelming the terminal). overwhelming the terminal.
The default is a trigger of 250 and an interval of 100. The default is a trigger of 250 and an interval of 100.
A trigger of zero disables the rate limiting. A trigger of zero disables the rate limiting.
.Pp .Pp
@ -3812,4 +3812,4 @@ bind-key S command-prompt "new-window -n %1 'ssh %1'"
.Sh SEE ALSO .Sh SEE ALSO
.Xr pty 4 .Xr pty 4
.Sh AUTHORS .Sh AUTHORS
.An Nicholas Marriott Aq nicm@users.sourceforge.net .An Nicholas Marriott Aq Mt nicm@users.sourceforge.net