diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/buffer.c | 4 | ||||
-rw-r--r-- | src/nvim/edit.c | 8 | ||||
-rw-r--r-- | src/nvim/ex_docmd.c | 2 | ||||
-rw-r--r-- | src/nvim/ex_getln.c | 2 | ||||
-rw-r--r-- | src/nvim/main.c | 6 | ||||
-rw-r--r-- | src/nvim/message.c | 2 | ||||
-rw-r--r-- | src/nvim/normal.c | 8 | ||||
-rw-r--r-- | src/nvim/regexp.c | 12 | ||||
-rw-r--r-- | src/nvim/regexp_nfa.c | 4 | ||||
-rw-r--r-- | src/nvim/spell.c | 10 | ||||
-rw-r--r-- | src/nvim/window.c | 4 |
11 files changed, 32 insertions, 30 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index a0ac8d3201..6735ae696f 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -3723,7 +3723,7 @@ int build_stl_str_hl( case STL_OFFSET_X: base = kNumBaseHexadecimal; - // fallthrough + FALLTHROUGH; case STL_OFFSET: { long l = ml_find_line_or_offset(wp->w_buffer, wp->w_cursor.lnum, NULL); @@ -3734,7 +3734,7 @@ int build_stl_str_hl( } case STL_BYTEVAL_X: base = kNumBaseHexadecimal; - // fallthrough + FALLTHROUGH; case STL_BYTEVAL: num = byteval; if (num == NL) diff --git a/src/nvim/edit.c b/src/nvim/edit.c index d29ea7f164..7b49eed2e2 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -775,7 +775,7 @@ static int insert_handle_key(InsertState *s) if (echeck_abbr(ESC + ABBR_OFF)) { break; } - // FALLTHROUGH + FALLTHROUGH; case Ctrl_C: // End input mode if (s->c == Ctrl_C && cmdwin_type != 0) { @@ -4967,16 +4967,16 @@ static unsigned quote_meta(char_u *dest, char_u *src, int len) if (ctrl_x_mode == CTRL_X_DICTIONARY || ctrl_x_mode == CTRL_X_THESAURUS) break; - // fallthrough + FALLTHROUGH; case '~': if (!p_magic) /* quote these only if magic is set */ break; - // fallthrough + FALLTHROUGH; case '\\': if (ctrl_x_mode == CTRL_X_DICTIONARY || ctrl_x_mode == CTRL_X_THESAURUS) break; - // fallthrough + FALLTHROUGH; case '^': // currently it's not needed. case '$': m++; diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index e4ab690bb9..ad51de46ee 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3290,7 +3290,7 @@ const char * set_one_cmd_context( while ((xp->xp_pattern = (char_u *)strchr(arg, ' ')) != NULL) { arg = (const char *)xp->xp_pattern + 1; } - // FALLTHROUGH + FALLTHROUGH; case CMD_buffer: case CMD_sbuffer: case CMD_checktime: diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 8654c9d023..a9c3df5aff 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1587,7 +1587,7 @@ static int command_line_handle_key(CommandLineState *s) } return command_line_not_changed(s); } - // fallthrough + FALLTHROUGH; case K_UP: case K_DOWN: diff --git a/src/nvim/main.c b/src/nvim/main.c index b00f7947bd..21620c04b4 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1045,7 +1045,8 @@ static void command_line_scan(mparm_T *parmp) argv_idx = -1; break; } - } // FALLTHROUGH + FALLTHROUGH; + } case 'S': // "-S {file}" execute Vim script case 'i': // "-i {shada}" use for ShaDa file case 'u': // "-u {vimrc}" vim inits file @@ -1189,7 +1190,8 @@ scripterror: argv_idx = -1; break; } - } // FALLTHROUGH + FALLTHROUGH; + } case 'W': { // "-W {scriptout}" overwrite script file if (scriptout != NULL) { goto scripterror; diff --git a/src/nvim/message.c b/src/nvim/message.c index 80f4f1defb..03561ba56f 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -2255,7 +2255,7 @@ static int do_more_prompt(int typed_char) skip_redraw = TRUE; /* skip redraw once */ need_wait_return = FALSE; /* don't wait in main() */ } - /*FALLTHROUGH*/ + FALLTHROUGH; case 'q': /* quit */ case Ctrl_C: case ESC: diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 32d9e7e982..ee3cd83963 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1867,7 +1867,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank) } else { bangredo = true; // do_bang() will put cmd in redo buffer. } - // fallthrough + FALLTHROUGH; case OP_INDENT: case OP_COLON: @@ -4480,7 +4480,7 @@ dozet: break; } undo = true; - /*FALLTHROUGH*/ + FALLTHROUGH; case 'g': /* "zg": add good word to word list */ case 'w': /* "zw": add wrong word to word list */ @@ -6907,7 +6907,7 @@ static void nv_g_cmd(cmdarg_T *cap) /* "g'm" and "g`m": jump to mark without setting pcmark */ case '\'': cap->arg = true; - /*FALLTHROUGH*/ + FALLTHROUGH; case '`': nv_gomark(cap); break; @@ -6965,7 +6965,7 @@ static void nv_g_cmd(cmdarg_T *cap) case 'q': case 'w': oap->cursor_start = curwin->w_cursor; - /*FALLTHROUGH*/ + FALLTHROUGH; case '~': case 'u': case 'U': diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 4f51a8b4cf..292e0ea7a2 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -1806,7 +1806,7 @@ static char_u *regatom(int *flagp) goto collection; /* "\_x" is character class plus newline */ - /*FALLTHROUGH*/ + FALLTHROUGH; /* * Character classes. @@ -5155,7 +5155,7 @@ regrepeat ( case IDENT: case IDENT + ADD_NL: testval = TRUE; - /*FALLTHROUGH*/ + FALLTHROUGH; case SIDENT: case SIDENT + ADD_NL: while (count < maxcount) { @@ -5182,7 +5182,7 @@ regrepeat ( case KWORD: case KWORD + ADD_NL: testval = TRUE; - /*FALLTHROUGH*/ + FALLTHROUGH; case SKWORD: case SKWORD + ADD_NL: while (count < maxcount) { @@ -5211,7 +5211,7 @@ regrepeat ( case FNAME: case FNAME + ADD_NL: testval = TRUE; - /*FALLTHROUGH*/ + FALLTHROUGH; case SFNAME: case SFNAME + ADD_NL: while (count < maxcount) { @@ -5239,7 +5239,7 @@ regrepeat ( case PRINT: case PRINT + ADD_NL: testval = TRUE; - /*FALLTHROUGH*/ + FALLTHROUGH; case SPRINT: case SPRINT + ADD_NL: while (count < maxcount) { @@ -5418,7 +5418,7 @@ do_class: case ANYOF: case ANYOF + ADD_NL: testval = TRUE; - /*FALLTHROUGH*/ + FALLTHROUGH; case ANYBUT: case ANYBUT + ADD_NL: diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c index 5b58003047..896803f641 100644 --- a/src/nvim/regexp_nfa.c +++ b/src/nvim/regexp_nfa.c @@ -1221,7 +1221,7 @@ static int nfa_regatom(void) goto collection; /* "\_x" is character class plus newline */ - /*FALLTHROUGH*/ + FALLTHROUGH; /* * Character classes. @@ -4209,7 +4209,7 @@ skip_add: subs = addstate(l, state->out, subs, pim, off_arg); break; } - // fallthrough + FALLTHROUGH; case NFA_MCLOSE1: case NFA_MCLOSE2: case NFA_MCLOSE3: diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 970e50771d..776445cfc1 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -4204,7 +4204,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so } PROF_STORE(sp->ts_state) sp->ts_state = STATE_PLAIN; - // FALLTHROUGH + FALLTHROUGH; case STATE_PLAIN: // Go over all possible bytes at this node, add each to tword[] @@ -4386,7 +4386,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so break; } - // FALLTHROUGH + FALLTHROUGH; case STATE_INS_PREP: if (sp->ts_flags & TSF_DIDDEL) { @@ -4416,7 +4416,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so } break; - // FALLTHROUGH + FALLTHROUGH; case STATE_INS: // Insert one byte. Repeat this for each possible byte at this @@ -4552,7 +4552,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so memmove(p + MB_PTR2LEN(p + n), p, n); utf_char2bytes(c, p); - // FALLTHROUGH + FALLTHROUGH; case STATE_SWAP3: // Swap two bytes, skipping one: "123" -> "321". We change @@ -4695,7 +4695,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so memmove(p, p + tl, n); utf_char2bytes(c, p + n); - // FALLTHROUGH + FALLTHROUGH; case STATE_REP_INI: // Check if matching with REP items from the .aff file would work. diff --git a/src/nvim/window.c b/src/nvim/window.c index 6f382acd84..b5da68063a 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -367,7 +367,7 @@ newwindow: g_do_tagpreview = Prenum; else g_do_tagpreview = p_pvh; - /*FALLTHROUGH*/ + FALLTHROUGH; case ']': case Ctrl_RSB: CHECK_CMDWIN @@ -465,7 +465,7 @@ wingotofile: g_do_tagpreview = Prenum; else g_do_tagpreview = p_pvh; - /*FALLTHROUGH*/ + FALLTHROUGH; case ']': case Ctrl_RSB: // Keep visual mode, can select words to use as a tag. |