aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-buffer.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2022-06-03 00:01:08 +0100
committerThomas Adam <thomas@xteddy.org>2022-06-03 00:01:08 +0100
commit1184dc08d4c85c489126365896602d151c8080ad (patch)
treee6b1082b1daecd7ab93ba6428f7b96b792ef3dad /cmd-set-buffer.c
parentbe2617036ff7f53343e24101654015b875258777 (diff)
parent18838fbc877b5c003449fa10df353405c024f0f5 (diff)
downloadrtmux-1184dc08d4c85c489126365896602d151c8080ad.tar.gz
rtmux-1184dc08d4c85c489126365896602d151c8080ad.tar.bz2
rtmux-1184dc08d4c85c489126365896602d151c8080ad.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-buffer.c')
-rw-r--r--cmd-set-buffer.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c
index 9112683f..c9ffe5ed 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);