Fix spurious eol appearing in non scrolling fifo buffers

This commit is contained in:
Maxime Coste 2014-06-30 18:56:18 +01:00
parent d6bb5b5a4b
commit b18db68c8a

View File

@ -47,9 +47,12 @@ Buffer* create_fifo_buffer(String name, int fd, bool scroll)
buffer->insert(pos, count > 0 ? String(data, data+count) buffer->insert(pos, count > 0 ? String(data, data+count)
: "*** kak: fifo closed ***\n"); : "*** kak: fifo closed ***\n");
if (prevent_scrolling) if (count > 0 and prevent_scrolling)
{ {
buffer->erase(buffer->begin(), buffer->begin()+1); buffer->erase(buffer->begin(), buffer->begin()+1);
// in the other case, the buffer will have automatically
// inserted a \n to guarantee its invariant.
if (data[count-1] == '\n')
buffer->insert(buffer->end(), "\n"); buffer->insert(buffer->end(), "\n");
} }