IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

globals: can_si is bool

Browse Source
This commit is contained in:
Jan Edmund Lazo 2018-08-06 11:35:34 -04:00
parent 5309ad29d4
commit 7692dfeecb
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/edit.c
View File

@ -4466,7 +4466,7 @@ static int ins_complete(int c, bool enable_pum)
did_ai = FALSE;
did_si = FALSE;
can_si = FALSE;
can_si = false;
can_si_back = false;
if (stop_arrow() == FAIL) {
return FAIL;
@ -5272,7 +5272,7 @@ insertchar (
did_ai = FALSE;
did_si = FALSE;
can_si = FALSE;
can_si = false;
can_si_back = false;
// If there's any pending input, grab up to INPUT_BUFLEN at once.
@ -5661,7 +5661,7 @@ internal_format (
// moved the cursor, don't autoindent or cindent now
did_ai = FALSE;
did_si = FALSE;
can_si = FALSE;
can_si = false;
can_si_back = false;
line_breakcheck();
}
@ -6083,7 +6083,7 @@ stop_insert (
}
did_ai = FALSE;
did_si = FALSE;
can_si = FALSE;
can_si = false;
can_si_back = false;
/* Set '[ and '] to the inserted text. When end_insert_pos is NULL we are
@ -7467,7 +7467,7 @@ static void ins_shift(int c, int lastc)
if (did_ai && *skipwhite(get_cursor_line_ptr()) != NUL)
did_ai = FALSE;
did_si = FALSE;
can_si = FALSE;
can_si = false;
can_si_back = false;
can_cindent = false; // no cindenting after ^D or ^T
}
@ -7491,7 +7491,7 @@ static void ins_del(void)
}
did_ai = FALSE;
did_si = FALSE;
can_si = FALSE;
can_si = false;
can_si_back = false;
AppendCharToRedobuff(K_DEL);
}

2
src/nvim/globals.h
View File

@ -638,7 +638,7 @@ EXTERN int did_si INIT(= FALSE);
* This flag is set after an auto indent. If the next typed character is a '}'
* one indent will be removed.
*/
EXTERN int can_si INIT(= FALSE);
EXTERN bool can_si INIT(= false);
/*
* This flag is set after an "O" command. If the next typed character is a '{'

7
src/nvim/misc1.c
View File

@ -328,8 +328,9 @@ open_line (
}
curwin->w_cursor = old_cursor;
}
if (do_si)
can_si = TRUE;
if (do_si) {
can_si = true;
}
did_ai = TRUE;
}
@ -666,7 +667,7 @@ open_line (
}
}
did_si = can_si = FALSE;
did_si = can_si = false;
} else if (comment_end != NULL) {
// We have finished a comment, so we don't use the leader.
// If this was a C-comment and 'ai' or 'si' is set do a normal

2
src/nvim/ops.c
View File

@ -2178,7 +2178,7 @@ int op_change(oparg_T *oap)
if (!p_paste && curbuf->b_p_si
&& !curbuf->b_p_cin
)
can_si = TRUE; /* It's like opening a new line, do si */
can_si = true; // It's like opening a new line, do si
}
/* First delete the text in the region. In an empty buffer only need to