diff options
| -rw-r--r-- | src/nvim/edit.c | 15 | ||||
| -rw-r--r-- | src/nvim/globals.h | 2 | ||||
| -rw-r--r-- | src/nvim/misc1.c | 7 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index a11609aa45..3d234c8c56 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -4467,9 +4467,10 @@ static int ins_complete(int c, bool enable_pum) did_ai = FALSE; did_si = FALSE; can_si = FALSE; - can_si_back = FALSE; - if (stop_arrow() == FAIL) + can_si_back = false; + if (stop_arrow() == FAIL) { return FAIL; + } line = ml_get(curwin->w_cursor.lnum); curs_col = curwin->w_cursor.col; @@ -5272,7 +5273,7 @@ insertchar ( did_ai = FALSE; did_si = FALSE; can_si = FALSE; - can_si_back = FALSE; + can_si_back = false; // If there's any pending input, grab up to INPUT_BUFLEN at once. // This speeds up normal text input considerably. @@ -5661,7 +5662,7 @@ internal_format ( did_ai = FALSE; did_si = FALSE; can_si = FALSE; - can_si_back = FALSE; + can_si_back = false; line_breakcheck(); } @@ -6083,7 +6084,7 @@ stop_insert ( did_ai = FALSE; did_si = FALSE; can_si = FALSE; - can_si_back = FALSE; + can_si_back = false; /* Set '[ and '] to the inserted text. When end_insert_pos is NULL we are * now in a different buffer. */ @@ -7467,7 +7468,7 @@ static void ins_shift(int c, int lastc) did_ai = FALSE; did_si = FALSE; can_si = FALSE; - can_si_back = FALSE; + can_si_back = false; can_cindent = false; // no cindenting after ^D or ^T } @@ -7491,7 +7492,7 @@ static void ins_del(void) did_ai = FALSE; did_si = FALSE; can_si = FALSE; - can_si_back = FALSE; + can_si_back = false; AppendCharToRedobuff(K_DEL); } diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 735aa834e3..c356716f44 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -644,7 +644,7 @@ EXTERN int can_si INIT(= FALSE); * This flag is set after an "O" command. If the next typed character is a '{' * one indent will be removed. */ -EXTERN int can_si_back INIT(= FALSE); +EXTERN bool can_si_back INIT(= false); // w_cursor before formatting text. EXTERN pos_T saved_cursor INIT(= INIT_POS_T(0, 0, 0)); diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 8d23224478..415b4938cc 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -320,10 +320,11 @@ open_line ( } } p = skipwhite(ptr); - if (*p == '}') /* if line starts with '}': do indent */ + if (*p == '}') { // if line starts with '}': do indent did_si = TRUE; - else /* can delete indent when '{' typed */ - can_si_back = TRUE; + } else { // can delete indent when '{' typed + can_si_back = true; + } } curwin->w_cursor = old_cursor; } |