summaryrefslogtreecommitdiff
path: root/src/command_manager.cc
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2015-03-13 13:39:18 +0000
committerMaxime Coste <frrrwww@gmail.com>2015-03-13 13:39:18 +0000
commit6b3201f0f1aa7e6bd59f766b29bccc2778555069 (patch)
treeebd4ab741e957e9d5a396f9a8097f8c48c1c417c /src/command_manager.cc
parentdbe27d3df21552de2003ca38a79c2a9f4406a829 (diff)
Change ShellManager to return both stdout and the return value in a pair
Diffstat (limited to 'src/command_manager.cc')
-rw-r--r--src/command_manager.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc
index 459fcc22..62018bc8 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -310,8 +310,8 @@ String eval_token(const Token& token, Context& context,
switch (token.type())
{
case Token::Type::ShellExpand:
- return ShellManager::instance().eval(content, context, shell_params,
- env_vars);
+ return ShellManager::instance().eval(content, context, {},
+ shell_params, env_vars).first;
case Token::Type::RegisterExpand:
return context.main_sel_register_value(content).str();
case Token::Type::OptionExpand: