diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2014-03-26 13:59:14 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-03-26 13:59:14 -0700 |
| commit | f2a437bd3bff39fc40e9fc0868cb22d47cc84614 (patch) | |
| tree | 4c43ea5be7814b6c1fa65be9c75e8e8548212d2b /builtin_set_color.cpp | |
| parent | 12025e30503f68ffbd4dac0d318e253c71c97bca (diff) | |
| parent | 7a7fb423b306d3de62ef62ff4c8cbded2cdd0f10 (diff) | |
Merge branch 'master' into parser_cleanup
Conflicts:
parse_constants.h
parse_tree.h
Diffstat (limited to 'builtin_set_color.cpp')
| -rw-r--r-- | builtin_set_color.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin_set_color.cpp b/builtin_set_color.cpp index 6e8f55b0..0fdc1ac0 100644 --- a/builtin_set_color.cpp +++ b/builtin_set_color.cpp @@ -235,9 +235,8 @@ static int builtin_set_color(parser_t &parser, wchar_t **argv) output_set_writer(saved_writer_func); /* Output the collected string */ - std::string local_output; - std::swap(builtin_set_color_output, local_output); - stdout_buffer.append(str2wcstring(local_output)); + stdout_buffer.append(str2wcstring(builtin_set_color_output)); + builtin_set_color_output.clear(); return STATUS_BUILTIN_OK; } |