mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 17:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

shada: Always use merging when reading jumps and changes

Browse Source
This commit is contained in:
ZyX
2015-08-10 01:28:48 +03:00
parent 4371842bcc
commit c9963872ef
1 changed files with 77 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/shada.c
View File

@@ -1359,19 +1359,6 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
shada_free_shada_entry(&cur_entry); shada_free_shada_entry(&cur_entry);
break; break;
} }
} else {
if (force) {
if (curwin->w_jumplistlen == JUMPLISTSIZE) {
// Jump list items are ignored in this case.
free_xfmark(fm);
} else {
memmove(&curwin->w_jumplist[1], &curwin->w_jumplist[0],
sizeof(curwin->w_jumplist[0])
* (size_t) curwin->w_jumplistlen);
curwin->w_jumplistidx++;
curwin->w_jumplistlen++;
curwin->w_jumplist[0] = fm;
}
} else { } else {
const int jl_len = curwin->w_jumplistlen; const int jl_len = curwin->w_jumplistlen;
int i; int i;
@@ -1422,7 +1409,6 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
shada_free_shada_entry(&cur_entry); shada_free_shada_entry(&cur_entry);
} }
} }
}
// Do not free shada entry: its allocated memory was saved above. // Do not free shada entry: its allocated memory was saved above.
break; break;
} }
@@ -1488,16 +1474,6 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
} else { } else {
int kh_ret; int kh_ret;
(void) kh_put(bufset, &cl_bufs, (uintptr_t) buf, &kh_ret); (void) kh_put(bufset, &cl_bufs, (uintptr_t) buf, &kh_ret);
if (force) {
if (buf->b_changelistlen == JUMPLISTSIZE) {
free_fmark(buf->b_changelist[0]);
memmove(buf->b_changelist, buf->b_changelist + 1,
sizeof(buf->b_changelist[0]) * (JUMPLISTSIZE - 1));
} else {
buf->b_changelistlen++;
}
buf->b_changelist[buf->b_changelistlen - 1] = fm;
} else {
const int cl_len = buf->b_changelistlen; const int cl_len = buf->b_changelistlen;
int i; int i;
for (i = cl_len; i > 0; i--) { for (i = cl_len; i > 0; i--) {
@@ -1538,7 +1514,6 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
cur_entry.data.filemark.fname = NULL; cur_entry.data.filemark.fname = NULL;
} }
} }
}
// Do not free shada entry: except for fname, its allocated memory (i.e. // Do not free shada entry: except for fname, its allocated memory (i.e.
// additional_data attribute contents if non-NULL) was saved above. // additional_data attribute contents if non-NULL) was saved above.
xfree(cur_entry.data.filemark.fname); xfree(cur_entry.data.filemark.fname);