mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 03:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_issue_1924' of https://github.com/s1341/kitty

Browse Source 
Fixes #1924
This commit is contained in:
Kovid Goyal
2019-08-26 10:19:50 +05:30
parent bfe595a8e8 bd3f0b5363
commit c905978874
6 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kitty/line-buf.c
View File

@@ -398,16 +398,17 @@ as_ansi(LineBuf *self, PyObject *callback) {
// remove trailing empty lines
index_type ylimit = self->ynum - 1;
bool truncated;
const GPUCell *prev_cell = NULL;
do {
init_line(self, (&l), self->line_map[ylimit]);
if (line_as_ansi(&l, t, 5120, &truncated) != 0) break;
if (line_as_ansi(&l, t, 5120, &truncated, &prev_cell) != 0) break;
ylimit--;
} while(ylimit > 0);
for(index_type i = 0; i <= ylimit; i++) {
l.continued = ((i < self->ynum - 1) ? self->line_attrs[i+1] : self->line_attrs[i]) & CONTINUED_MASK;
init_line(self, (&l), self->line_map[i]);
index_type num = line_as_ansi(&l, t, 5120, &truncated);
index_type num = line_as_ansi(&l, t, 5120, &truncated, &prev_cell);
if (!(l.continued) && num < 5119) t[num++] = 10; // 10 = \n
PyObject *ans = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, t, num);
if (ans == NULL) return PyErr_NoMemory();