aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-14 00:01:41 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-14 00:01:41 +0100
commit653a159225609f7e5efb45bc78cdf7b480d7ef93 (patch)
treede075bcb7fdbd8a3fbd9f800c3a04c63cfdfac6b /cmd-set-option.c
parent2159ff3256df4b823dfaed24e64047249cf079c2 (diff)
parentfc83517913c8280c222a6cf78ca7fb8053421b37 (diff)
downloadrtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.tar.gz
rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.tar.bz2
rtmux-653a159225609f7e5efb45bc78cdf7b480d7ef93.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 4e81dc5e..1752d093 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -84,7 +84,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
struct args *args = cmd_get_args(self);
int append = args_has(args, 'a');
struct cmd_find_state *target = cmdq_get_target(item);
- struct client *c, *loop;
+ struct client *loop;
struct session *s = target->s;
struct window *w;
struct window_pane *wp;
@@ -98,8 +98,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
window = (cmd_get_entry(self) == &cmd_set_window_option_entry);
/* Expand argument. */
- c = cmd_find_client(item, NULL, 1);
- argument = format_single_from_target(item, args->argv[0], c);
+ argument = format_single_from_target(item, args->argv[0]);
/* If set-hook -R, fire the hook straight away. */
if (cmd_get_entry(self) == &cmd_set_hook_entry && args_has(args, 'R')) {
@@ -122,7 +121,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
if (args->argc < 2)
value = NULL;
else if (args_has(args, 'F'))
- value = format_single_from_target(item, args->argv[1], c);
+ value = format_single_from_target(item, args->argv[1]);
else
value = xstrdup(args->argv[1]);