diff options
| author | Maxime Coste <mawww@kakoune.org> | 2021-01-04 09:45:53 +1100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2021-01-04 09:45:53 +1100 |
| commit | 49d1d4666db55978129a963b4b0eac86f43a3bef (patch) | |
| tree | 53f6e88318275ac2cb3bd7f6369551e93854cb6c /src/command_manager.cc | |
| parent | 183bb660b7616e013b75a0986f632640bb1a6f01 (diff) | |
| parent | 7cde14680750ac71a9f127e2370bac3ad263e1e1 (diff) | |
Merge remote-tracking branch 'cole-h/trim-only-one-newline'
Diffstat (limited to 'src/command_manager.cc')
| -rw-r--r-- | src/command_manager.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc index ca619f7f..82f4425a 100644 --- a/src/command_manager.cc +++ b/src/command_manager.cc @@ -323,14 +323,9 @@ expand_token(const Token& token, const Context& context, const ShellContext& she content, context, {}, ShellManager::Flags::WaitForStdout, shell_context).first; - int trailing_eol_count = 0; - for (auto c : str | reverse()) - { - if (c != '\n') - break; - ++trailing_eol_count; - } - str.resize(str.length() - trailing_eol_count, 0); + if (str.back() == '\n') + str.resize(str.length() - 1, 0); + return {str}; } case Token::Type::RegisterExpand: |