diff options
| author | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-07-21 15:53:59 -0600 |
| commit | b11548e3db4361cd8312ffbd27472823bdab4d62 (patch) | |
| tree | a84b5cf79fb41bb60b6495c1a346bb360b224604 /cmd-set-buffer.c | |
| parent | 88ebf5544e995d85b2f1416a216ac7f44f719eed (diff) | |
| parent | ab1d18d00febe161080b8e81331861481110809f (diff) | |
| download | rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.gz rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.tar.bz2 rtmux-b11548e3db4361cd8312ffbd27472823bdab4d62.zip | |
Merge remote-tracking branch 'origin/master' into rahm
Diffstat (limited to 'cmd-set-buffer.c')
| -rw-r--r-- | cmd-set-buffer.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index 9112683f..35e72955 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -69,8 +69,13 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item) pb = paste_get_name(bufname); if (cmd_get_entry(self) == &cmd_delete_buffer_entry) { - if (pb == NULL) + if (pb == NULL) { + if (bufname != NULL) { + cmdq_error(item, "unknown buffer: %s", bufname); + return (CMD_RETURN_ERROR); + } pb = paste_get_top(&bufname); + } if (pb == NULL) { cmdq_error(item, "no buffer"); return (CMD_RETURN_ERROR); @@ -80,8 +85,13 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item) } if (args_has(args, 'n')) { - if (pb == NULL) + if (pb == NULL) { + if (bufname != NULL) { + cmdq_error(item, "unknown buffer: %s", bufname); + return (CMD_RETURN_ERROR); + } pb = paste_get_top(&bufname); + } if (pb == NULL) { cmdq_error(item, "no buffer"); return (CMD_RETURN_ERROR); @@ -121,7 +131,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_ERROR); } if (args_has(args, 'w') && tc != NULL) - tty_set_selection(&tc->tty, bufdata, bufsize); + tty_set_selection(&tc->tty, "", bufdata, bufsize); return (CMD_RETURN_NORMAL); } |