aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0923: terminal dump diff swap does not update file names

Browse Source 
Problem:    Terminal dump diff swap does not update file names.
Solution:   Also swap the file name.  Add a test.
This commit is contained in:
Bram Moolenaar
2019-02-15 00:16:13 +01:00
parent 96baf02aa8
commit c3ef896608
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/terminal.c
View File

@@ -4816,7 +4816,7 @@ term_swap_diff()
bot_start = line_count - bot_rows;
sb_line = (sb_line_T *)term->tl_scrollback.ga_data;
/* move lines from top to above the bottom part */
// move lines from top to above the bottom part
for (lnum = 1; lnum <= top_rows; ++lnum)
{
p = vim_strsave(ml_get(1));
@@ -4827,7 +4827,7 @@ term_swap_diff()
vim_free(p);
}
/* move lines from bottom to the top */
// move lines from bottom to the top
for (lnum = 1; lnum <= bot_rows; ++lnum)
{
p = vim_strsave(ml_get(bot_start + lnum));
@@ -4838,6 +4838,22 @@ term_swap_diff()
vim_free(p);
}
// move top title to bottom
p = vim_strsave(ml_get(bot_rows + 1));
if (p == NULL)
return OK;
ml_append(line_count - top_rows - 1, p, 0, FALSE);
ml_delete(bot_rows + 1, FALSE);
vim_free(p);
// move bottom title to top
p = vim_strsave(ml_get(line_count - top_rows));
if (p == NULL)
return OK;
ml_delete(line_count - top_rows, FALSE);
ml_append(bot_rows, p, 0, FALSE);
vim_free(p);
if (top_rows == bot_rows)
{
/* rows counts are equal, can swap cell properties */