mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-05 06:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Justin M. Keyes
2019-05-06 10:02:15 +02:00
parent e7a8908b11
commit 91547a80b6
2 changed files with 113 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/eval.c
View File

@@ -19863,9 +19863,9 @@ void ex_echo(exarg_T *eap)
}
eap->nextcmd = check_nextcmd(arg);
if (eap->skip)
--emsg_skip;
else {
if (eap->skip) {
emsg_skip--;
} else {
// remove text that may still be there from the command
msg_clr_eos();
if (eap->cmdidx == CMD_echo) {

16
src/nvim/tag.c
View File

@@ -2881,8 +2881,8 @@ static void get_tag_details(taggy_T *tag, dict_T *retdict)
tv_list_append_number(pos,
(varnumber_T)(fmark->fnum != -1 ? fmark->fnum : 0));
tv_list_append_number(pos, (varnumber_T)fmark->mark.lnum);
tv_list_append_number(pos, (varnumber_T)(fmark->mark.col == MAXCOL ?
MAXCOL : fmark->mark.col + 1));
tv_list_append_number(pos, (varnumber_T)(fmark->mark.col == MAXCOL
? MAXCOL : fmark->mark.col + 1));
tv_list_append_number(pos, (varnumber_T)fmark->mark.coladd);
}
@@ -2909,10 +2909,8 @@ void get_tagstack(win_T *wp, dict_T *retdict)
// Free all the entries in the tag stack of the specified window
static void tagstack_clear(win_T *wp)
{
int i;
// Free the current tag stack
for (i = 0; i < wp->w_tagstacklen; i++) {
for (int i = 0; i < wp->w_tagstacklen; i++) {
xfree(wp->w_tagstack[i].tagname);
}
wp->w_tagstacklen = 0;
@@ -2924,10 +2922,8 @@ static void tagstack_clear(win_T *wp)
static void tagstack_shift(win_T *wp)
{
taggy_T *tagstack = wp->w_tagstack;
int i;
xfree(tagstack[0].tagname);
for (i = 1; i < wp->w_tagstacklen; i++) {
for (int i = 1; i < wp->w_tagstacklen; i++) {
tagstack[i - 1] = tagstack[i];
}
wp->w_tagstacklen--;
@@ -2987,8 +2983,8 @@ static void tagstack_push_items(win_T *wp, list_T *l)
if (list2fpos(&di->di_tv, &mark, &fnum, NULL) != OK) {
continue;
}
if ((tagname = (char_u *)
tv_dict_get_string(itemdict, "tagname", true)) == NULL) {
if ((tagname = (char_u *)tv_dict_get_string(itemdict, "tagname", true))
== NULL) {
continue;
}