circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-09-14 16:01:08 +01:00
parent 166aa97f75 16ee4de5df
commit b5d789a531
6 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd-find.c
View File

@@ -561,7 +561,6 @@ cmd_find_get_window_with_session(struct cmd_find_state *fs, const char *window)
return (0); return (0);
} }
/* Stop now if exact only. */ /* Stop now if exact only. */
if (exact) if (exact)
return (-1); return (-1);

6
cmd-set-buffer.c
View File

@@ -56,11 +56,13 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
bufname = args_get(args, 'b'); bufname = args_get(args, 'b');
if (bufname == NULL) if (bufname == NULL)
pb = paste_get_top(&bufname); pb = NULL;
else else
pb = paste_get_name(bufname); pb = paste_get_name(bufname);
if (self->entry == &cmd_delete_buffer_entry) { if (self->entry == &cmd_delete_buffer_entry) {
if (pb == NULL)
pb = paste_get_top(&bufname);
if (pb == NULL) { if (pb == NULL) {
cmdq_error(cmdq, "no buffer"); cmdq_error(cmdq, "no buffer");
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
@@ -70,6 +72,8 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
} }
if (args_has(args, 'n')) { if (args_has(args, 'n')) {
if (pb == NULL)
pb = paste_get_top(&bufname);
if (pb == NULL) { if (pb == NULL) {
cmdq_error(cmdq, "no buffer"); cmdq_error(cmdq, "no buffer");
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);

1
cmd-set-option.c
View File

@@ -263,7 +263,6 @@ cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char *optstr,
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }
/* Unset an option. */ /* Unset an option. */
int int
cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq, cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq,

1
paste.c
View File

@@ -253,7 +253,6 @@ paste_set(char *data, size_t size, const char *name, char **cause)
return (-1); return (-1);
} }
pb = xmalloc(sizeof *pb); pb = xmalloc(sizeof *pb);
pb->name = xstrdup(name); pb->name = xstrdup(name);

1
screen-write.c
View File

@@ -46,7 +46,6 @@ screen_write_stop(unused struct screen_write_ctx *ctx)
{ {
} }
/* Reset screen state. */ /* Reset screen state. */
void void
screen_write_reset(struct screen_write_ctx *ctx) screen_write_reset(struct screen_write_ctx *ctx)

1
window-clock.c
View File

@@ -233,7 +233,6 @@ window_clock_draw_screen(struct window_pane *wp)
screen_write_puts(&ctx, &gc, "%s", tim); screen_write_puts(&ctx, &gc, "%s", tim);
} }
screen_write_stop(&ctx); screen_write_stop(&ctx);
return; return;
} }