mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-18 07:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Jan Edmund Lazo
2019-05-19 08:57:10 -04:00
parent 854073f1db
commit bd885d878f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/mark.c
View File

@@ -782,7 +782,7 @@ void ex_jumps(exarg_T *eap)
char_u *name; char_u *name;
cleanup_jumplist(curwin, true); cleanup_jumplist(curwin, true);
/* Highlight title */ // Highlight title
MSG_PUTS_TITLE(_("\n jump line col file/text")); MSG_PUTS_TITLE(_("\n jump line col file/text"));
for (i = 0; i < curwin->w_jumplistlen && !got_int; ++i) { for (i = 0; i < curwin->w_jumplistlen && !got_int; ++i) {
if (curwin->w_jumplist[i].fmark.mark.lnum != 0) { if (curwin->w_jumplist[i].fmark.mark.lnum != 0) {
@@ -1161,7 +1161,6 @@ void mark_col_adjust(
void cleanup_jumplist(win_T *wp, bool loadfiles) void cleanup_jumplist(win_T *wp, bool loadfiles)
{ {
int i; int i;
int from, to;
if (loadfiles) { if (loadfiles) {
// If specified, load all the files from the jump list. This is // If specified, load all the files from the jump list. This is
@@ -1175,17 +1174,20 @@ void cleanup_jumplist(win_T *wp, bool loadfiles)
} }
} }
to = 0; int to = 0;
for (from = 0; from < wp->w_jumplistlen; ++from) { for (int from = 0; from < wp->w_jumplistlen; from++) {
if (wp->w_jumplistidx == from) if (wp->w_jumplistidx == from) {
wp->w_jumplistidx = to; wp->w_jumplistidx = to;
for (i = from + 1; i < wp->w_jumplistlen; ++i) }
for (i = from + 1; i < wp->w_jumplistlen; i++) {
if (wp->w_jumplist[i].fmark.fnum if (wp->w_jumplist[i].fmark.fnum
== wp->w_jumplist[from].fmark.fnum == wp->w_jumplist[from].fmark.fnum
&& wp->w_jumplist[from].fmark.fnum != 0 && wp->w_jumplist[from].fmark.fnum != 0
&& wp->w_jumplist[i].fmark.mark.lnum && wp->w_jumplist[i].fmark.mark.lnum
== wp->w_jumplist[from].fmark.mark.lnum) == wp->w_jumplist[from].fmark.mark.lnum) {
break; break;
}
}
if (i >= wp->w_jumplistlen) { // no duplicate if (i >= wp->w_jumplistlen) { // no duplicate
if (to != from) { if (to != from) {
// Not using wp->w_jumplist[to++] = wp->w_jumplist[from] because // Not using wp->w_jumplist[to++] = wp->w_jumplist[from] because