summaryrefslogtreecommitdiff
path: root/src/command_manager.cc
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2020-03-01 13:28:06 +1100
committerMaxime Coste <mawww@kakoune.org>2020-03-02 20:53:28 +1100
commit0a66eb9c47ba9a7d3b90286d66a70b5bd7eee15a (patch)
tree66d125cdf38c006b9acacea73213da8deca13ed2 /src/command_manager.cc
parentb8eef27e041ce68fda01f66e3cc902e97b25fbaf (diff)
Expand env vars as list of strings
This makes it possible to do :select `%val{selections_decs}` and to correctly combine $kak_quoted with those.
Diffstat (limited to 'src/command_manager.cc')
-rw-r--r--src/command_manager.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc
index 82985b5d..e4b57de6 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -362,7 +362,10 @@ expand_token(const Token& token, const Context& context, const ShellContext& she
auto it = shell_context.env_vars.find(content);
if (it != shell_context.env_vars.end())
return {it->value};
- return {ShellManager::instance().get_val(content, context, Quoting::Kakoune)};
+ if constexpr (single)
+ return join(ShellManager::instance().get_val(content, context), false, ' ');
+ else
+ return ShellManager::instance().get_val(content, context);
}
case Token::Type::ArgExpand:
{