diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-20 14:58:23 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-20 14:58:23 +0000 |
| commit | 7905f4600dd4ee0f88c4fadf1641c2afb2acc77a (patch) | |
| tree | d7556b95b5862b5493e722077fe08e11156a20e3 | |
| parent | 41c39e9bd96b1078058dd3febc0d2ff313c5c9c8 (diff) | |
| parent | f81d72326458ec421348ab5aecc7038c1850407c (diff) | |
| download | rtmux-7905f4600dd4ee0f88c4fadf1641c2afb2acc77a.tar.gz rtmux-7905f4600dd4ee0f88c4fadf1641c2afb2acc77a.tar.bz2 rtmux-7905f4600dd4ee0f88c4fadf1641c2afb2acc77a.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
| -rw-r--r-- | cmd-capture-pane.c | 5 | ||||
| -rw-r--r-- | cmd-save-buffer.c | 8 | ||||
| -rw-r--r-- | grid.c | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c index 80be0165..83ec303c 100644 --- a/cmd-capture-pane.c +++ b/cmd-capture-pane.c @@ -44,7 +44,7 @@ enum cmd_retval cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; - struct client *c = ctx->cmdclient; + struct client *c; struct window_pane *wp; char *buf, *line, *cause; struct screen *s; @@ -106,6 +106,9 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx) } if (args_has(args, 'p')) { + c = ctx->curclient; + if (c == NULL || !(c->flags & CLIENT_CONTROL)) + c = ctx->cmdclient; if (c == NULL) { ctx->error(ctx, "can't write to stdout"); return (CMD_RETURN_ERROR); diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index 638c5742..1d39bc9e 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -45,7 +45,7 @@ enum cmd_retval cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; - struct client *c = ctx->cmdclient; + struct client *c; struct session *s; struct paste_buffer *pb; const char *path, *newpath, *wd; @@ -76,13 +76,17 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) path = args->argv[0]; if (strcmp(path, "-") == 0) { + c = ctx->curclient; + if (c == NULL || !(c->flags & CLIENT_CONTROL)) + c = ctx->cmdclient; if (c == NULL) { - ctx->error(ctx, "%s: can't write to stdout", path); + ctx->error(ctx, "can't write to stdout"); return (CMD_RETURN_ERROR); } evbuffer_add(c->stdout_data, pb->data, pb->size); server_push_stdout(c); } else { + c = ctx->cmdclient; if (c != NULL) wd = c->cwd; else if ((s = cmd_current_session(ctx, 0)) != NULL) { @@ -511,6 +511,7 @@ grid_string_cells_code(const struct grid_cell *lastgc, for (i = 0; i < nitems(attrs); i++) { if (!(attr & attrs[i].mask) && (lastattr & attrs[i].mask)) { s[n++] = 0; + lastattr &= GRID_ATTR_CHARSET; break; } } @@ -523,7 +524,8 @@ grid_string_cells_code(const struct grid_cell *lastgc, /* If the foreground c changed, append its parameters. */ nnewc = grid_string_cells_fg(gc, newc); noldc = grid_string_cells_fg(lastgc, oldc); - if (nnewc != noldc || memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) { + if (nnewc != noldc || + memcmp(newc,oldc, nnewc * sizeof newc[0]) != 0) { for (i = 0; i < nnewc; i++) s[n++] = newc[i]; } @@ -531,7 +533,8 @@ grid_string_cells_code(const struct grid_cell *lastgc, /* If the background c changed, append its parameters. */ nnewc = grid_string_cells_bg(gc, newc); noldc = grid_string_cells_bg(lastgc, oldc); - if (nnewc != noldc || memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) { + if (nnewc != noldc || + memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0) { for (i = 0; i < nnewc; i++) s[n++] = newc[i]; } |