diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-09-21 08:20:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 08:20:20 +0200 |
| commit | ad6bbe44683cf936ec2268ee89e8e1c22f538ecc (patch) | |
| tree | e639cb06834f05b90d513dd8f67a3a7191082543 /src/nvim/normal.c | |
| parent | e55ebae3734068239c7070dd20ddc34b06c20a7c (diff) | |
| parent | 01b2fa53f4593024437f5df25b7744b16b164e4f (diff) | |
| download | rneovim-ad6bbe44683cf936ec2268ee89e8e1c22f538ecc.tar.gz rneovim-ad6bbe44683cf936ec2268ee89e8e1c22f538ecc.tar.bz2 rneovim-ad6bbe44683cf936ec2268ee89e8e1c22f538ecc.zip | |
Merge #9022 from janlazo/vim-8.0.1215
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 32d9e7e982..45620bfc54 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: @@ -4202,12 +4202,12 @@ dozet: else curwin->w_cursor.lnum = curwin->w_botline; } - /* FALLTHROUGH */ + FALLTHROUGH; case NL: case CAR: case K_KENTER: beginline(BL_WHITE | BL_FIX); - /* FALLTHROUGH */ + FALLTHROUGH; case 't': scroll_cursor_top(0, true); redraw_later(VALID); @@ -4216,7 +4216,7 @@ dozet: /* "z." and "zz": put cursor in middle of screen */ case '.': beginline(BL_WHITE | BL_FIX); - /* FALLTHROUGH */ + FALLTHROUGH; case 'z': scroll_cursor_halfway(true); redraw_later(VALID); @@ -4234,10 +4234,10 @@ dozet: curwin->w_cursor.lnum = 1; else curwin->w_cursor.lnum = curwin->w_topline - 1; - /* FALLTHROUGH */ + FALLTHROUGH; case '-': beginline(BL_WHITE | BL_FIX); - /* FALLTHROUGH */ + FALLTHROUGH; case 'b': scroll_cursor_bot(0, true); redraw_later(VALID); @@ -4247,7 +4247,7 @@ dozet: /* "zH" - scroll screen right half-page */ case 'H': cap->count1 *= curwin->w_width / 2; - /* FALLTHROUGH */ + FALLTHROUGH; /* "zh" - scroll screen to the right */ case 'h': @@ -4263,7 +4263,7 @@ dozet: /* "zL" - scroll screen left half-page */ case 'L': cap->count1 *= curwin->w_width / 2; - /* FALLTHROUGH */ + FALLTHROUGH; /* "zl" - scroll screen to the left */ case 'l': @@ -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 */ @@ -6663,7 +6663,7 @@ static void nv_g_cmd(cmdarg_T *cap) */ case K_BS: cap->nchar = Ctrl_H; - /* FALLTHROUGH */ + FALLTHROUGH; case 'h': case 'H': case Ctrl_H: @@ -6729,7 +6729,7 @@ static void nv_g_cmd(cmdarg_T *cap) */ case '^': flag = true; - /* FALLTHROUGH */ + FALLTHROUGH; case '0': case 'm': @@ -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': |