xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spurious eol appearing in non scrolling fifo buffers

Browse Source
This commit is contained in:
Maxime Coste 2014-06-30 18:56:18 +01:00
parent d6bb5b5a4b
commit b18db68c8a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/buffer_utils.cc
View File

@ -47,10 +47,13 @@ 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);
buffer->insert(buffer->end(), "\n"); // 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");
} }
FD_ZERO(&rfds); FD_ZERO(&rfds);