diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-09-15 13:57:57 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-09-15 13:57:57 +0100 |
| commit | 57ad1f6ddf0776a2115b3bf62d58744666b1b283 (patch) | |
| tree | 7f0ed40c51abe69141bea82940c2637bd61474a5 | |
| parent | 54bd7612868341c47bd3bd237c9598d5860b3ef3 (diff) | |
| parent | b5d789a53167552e355848ecfec100cb70b61d97 (diff) | |
| download | rtmux-57ad1f6ddf0776a2115b3bf62d58744666b1b283.tar.gz rtmux-57ad1f6ddf0776a2115b3bf62d58744666b1b283.tar.bz2 rtmux-57ad1f6ddf0776a2115b3bf62d58744666b1b283.zip | |
Merge branch 'master' of github.com:tmux/tmux
| -rw-r--r-- | cmd-find.c | 1 | ||||
| -rw-r--r-- | cmd-set-buffer.c | 6 | ||||
| -rw-r--r-- | cmd-set-option.c | 1 | ||||
| -rw-r--r-- | paste.c | 1 | ||||
| -rw-r--r-- | screen-write.c | 1 | ||||
| -rw-r--r-- | window-clock.c | 1 |
6 files changed, 5 insertions, 6 deletions
@@ -561,7 +561,6 @@ cmd_find_get_window_with_session(struct cmd_find_state *fs, const char *window) return (0); } - /* Stop now if exact only. */ if (exact) return (-1); diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index 01afa774..e7f7627e 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -56,11 +56,13 @@ cmd_set_buffer_exec(struct cmd *self, struct cmd_q *cmdq) bufname = args_get(args, 'b'); if (bufname == NULL) - pb = paste_get_top(&bufname); + pb = NULL; else pb = paste_get_name(bufname); if (self->entry == &cmd_delete_buffer_entry) { + if (pb == NULL) + pb = paste_get_top(&bufname); if (pb == NULL) { cmdq_error(cmdq, "no buffer"); 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 (pb == NULL) + pb = paste_get_top(&bufname); if (pb == NULL) { cmdq_error(cmdq, "no buffer"); return (CMD_RETURN_ERROR); diff --git a/cmd-set-option.c b/cmd-set-option.c index 98ab2513..e0b07edb 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -263,7 +263,6 @@ cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char *optstr, return (CMD_RETURN_NORMAL); } - /* Unset an option. */ int cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq, @@ -253,7 +253,6 @@ paste_set(char *data, size_t size, const char *name, char **cause) return (-1); } - pb = xmalloc(sizeof *pb); pb->name = xstrdup(name); diff --git a/screen-write.c b/screen-write.c index 37e2b548..f80048b6 100644 --- a/screen-write.c +++ b/screen-write.c @@ -46,7 +46,6 @@ screen_write_stop(unused struct screen_write_ctx *ctx) { } - /* Reset screen state. */ void screen_write_reset(struct screen_write_ctx *ctx) diff --git a/window-clock.c b/window-clock.c index 4a497891..5bc546a9 100644 --- a/window-clock.c +++ b/window-clock.c @@ -233,7 +233,6 @@ window_clock_draw_screen(struct window_pane *wp) screen_write_puts(&ctx, &gc, "%s", tim); } - screen_write_stop(&ctx); return; } |