diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-10-02 08:14:01 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 08:14:01 +1000 |
commit | 82559c16c701aa912b341ecbbd116c2992c5e698 (patch) | |
tree | 6b9f56b3700dda60efdaff4446fc684009490b5b /sway | |
parent | Fix smart gaps (diff) | |
parent | Merge pull request #2735 from RedSoxFan/fix-quotes (diff) | |
download | sway-82559c16c701aa912b341ecbbd116c2992c5e698.tar.gz sway-82559c16c701aa912b341ecbbd116c2992c5e698.tar.zst sway-82559c16c701aa912b341ecbbd116c2992c5e698.zip |
Merge branch 'master' into fix-2653
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index 03761c52..03cfebd7 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -391,7 +391,11 @@ struct cmd_results *config_command(char *exec) { | |||
391 | // Var replacement, for all but first argument of set | 391 | // Var replacement, for all but first argument of set |
392 | // TODO commands | 392 | // TODO commands |
393 | for (i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { | 393 | for (i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { |
394 | if (*argv[i] == '\"' || *argv[i] == '\'') { | 394 | if (handler->handle != cmd_exec && handler->handle != cmd_exec_always |
395 | && handler->handle != cmd_bindsym | ||
396 | && handler->handle != cmd_bindcode | ||
397 | && handler->handle != cmd_set | ||
398 | && (*argv[i] == '\"' || *argv[i] == '\'')) { | ||
395 | strip_quotes(argv[i]); | 399 | strip_quotes(argv[i]); |
396 | } | 400 | } |
397 | argv[i] = do_var_replacement(argv[i]); | 401 | argv[i] = do_var_replacement(argv[i]); |