Skip to content

Commit 96b4e92

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents 381aa9a + 6ce6504 commit 96b4e92

File tree

15 files changed

+42
-29
lines changed

15 files changed

+42
-29
lines changed

‎src/buffer.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4335,6 +4335,7 @@ build_stl_str_hl(
43354335

43364336
case STL_OFFSET_X:
43374337
base = 'X';
4338+
/* FALLTHROUGH */
43384339
case STL_OFFSET:
43394340
#ifdef FEAT_BYTEOFF
43404341
l = ml_find_line_or_offset(wp->w_buffer, wp->w_cursor.lnum, NULL);
@@ -4346,6 +4347,7 @@ build_stl_str_hl(
43464347

43474348
case STL_BYTEVAL_X:
43484349
base = 'X';
4350+
/* FALLTHROUGH */
43494351
case STL_BYTEVAL:
43504352
num = byteval;
43514353
if (num == NL)

‎src/edit.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ edit(
984984
case ESC: /* End input mode */
985985
if (echeck_abbr(ESC + ABBR_OFF))
986986
break;
987-
/*FALLTHROUGH*/
987+
/* FALLTHROUGH */
988988

989989
case Ctrl_C: /* End input mode */
990990
#ifdef FEAT_CMDWIN
@@ -5788,13 +5788,16 @@ quote_meta(char_u *dest, char_u *src, int len)
57885788
if (ctrl_x_mode == CTRL_X_DICTIONARY
57895789
|| ctrl_x_mode == CTRL_X_THESAURUS)
57905790
break;
5791+
/* FALLTHROUGH */
57915792
case '~':
57925793
if (!p_magic) /* quote these only if magic is set */
57935794
break;
5795+
/* FALLTHROUGH */
57945796
case '\\':
57955797
if (ctrl_x_mode == CTRL_X_DICTIONARY
57965798
|| ctrl_x_mode == CTRL_X_THESAURUS)
57975799
break;
5800+
/* FALLTHROUGH */
57985801
case '^': /* currently it's not needed. */
57995802
case '$':
58005803
m++;

‎src/eval.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6995,7 +6995,7 @@ free_tv(typval_T *varp)
69956995
{
69966996
case VAR_FUNC:
69976997
func_unref(varp->vval.v_string);
6998-
/*FALLTHROUGH*/
6998+
/* FALLTHROUGH */
69996999
case VAR_STRING:
70007000
vim_free(varp->vval.v_string);
70017001
break;
@@ -7040,7 +7040,7 @@ clear_tv(typval_T *varp)
70407040
{
70417041
case VAR_FUNC:
70427042
func_unref(varp->vval.v_string);
7043-
/*FALLTHROUGH*/
7043+
/* FALLTHROUGH */
70447044
case VAR_STRING:
70457045
vim_free(varp->vval.v_string);
70467046
varp->vval.v_string = NULL;

‎src/ex_cmds.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,6 +3002,7 @@ ex_file(exarg_T *eap)
30023002
/* print full file name if :cd used */
30033003
if (!shortmess(SHM_FILEINFO))
30043004
fileinfo(FALSE, FALSE, eap->forceit);
3005+
redraw_tabline = TRUE;
30053006
}
30063007

30073008
/*

‎src/ex_docmd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4122,7 +4122,7 @@ set_one_cmd_context(
41224122
case CMD_bunload:
41234123
while ((xp->xp_pattern = vim_strchr(arg, ' ')) != NULL)
41244124
arg = xp->xp_pattern + 1;
4125-
/*FALLTHROUGH*/
4125+
/* FALLTHROUGH */
41264126
case CMD_buffer:
41274127
case CMD_sbuffer:
41284128
case CMD_checktime:

‎src/ex_getln.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,9 +1571,8 @@ getcmdline(
15711571
break;
15721572
goto cmdline_not_changed;
15731573
}
1574-
/* FALLTHROUGH */
1575-
15761574
#ifdef FEAT_CMDHIST
1575+
/* FALLTHROUGH */
15771576
case K_UP:
15781577
case K_DOWN:
15791578
case K_S_UP:

‎src/if_perl.xs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,7 @@ perl_to_vim(SV *sv, typval_T *rettv)
11011101
rettv->vval.v_number = SvIV(sv);
11021102
break;
11031103
}
1104+
/* FALLTHROUGH */
11041105
case SVt_PV: /* string */
11051106
{
11061107
size_t len = 0;

‎src/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2312,7 +2312,7 @@ command_line_scan(mparm_T *parmp)
23122312
argv_idx = -1;
23132313
break;
23142314
}
2315-
/*FALLTHROUGH*/
2315+
/* FALLTHROUGH */
23162316
case 'S': /* "-S {file}" execute Vim script */
23172317
case 'i': /* "-i {viminfo}" use for viminfo */
23182318
#ifndef FEAT_DIFF
@@ -2470,7 +2470,7 @@ command_line_scan(mparm_T *parmp)
24702470
argv_idx = -1;
24712471
break;
24722472
}
2473-
/*FALLTHROUGH*/
2473+
/* FALLTHROUGH */
24742474
case 'W': /* "-W {scriptout}" overwrite script file */
24752475
if (scriptout != NULL)
24762476
goto scripterror;

‎src/message.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,8 @@ emsg(char_u *s)
670670

671671
ex_exitval = 1;
672672

673-
/* Reset msg_silent, an error causes messages to be switched back on. */
673+
/* Reset msg_silent, an error causes messages to be switched back on.
674+
*/
674675
msg_silent = 0;
675676
cmd_silent = FALSE;
676677

@@ -2841,7 +2842,7 @@ do_more_prompt(int typed_char)
28412842
skip_redraw = TRUE; /* skip redraw once */
28422843
need_wait_return = FALSE; /* don't wait in main() */
28432844
}
2844-
/*FALLTHROUGH*/
2845+
/* FALLTHROUGH */
28452846
case 'q': /* quit */
28462847
case Ctrl_C:
28472848
case ESC:

‎src/normal.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,6 +1945,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
19451945
AppendToRedobuff((char_u *)"!\r"); /* use any last used !cmd */
19461946
else
19471947
bangredo = TRUE; /* do_bang() will put cmd in redo buffer */
1948+
/* FALLTHROUGH */
19481949

19491950
case OP_INDENT:
19501951
case OP_COLON:
@@ -5175,7 +5176,7 @@ nv_zet(cmdarg_T *cap)
51755176
break;
51765177
}
51775178
undo = TRUE;
5178-
/*FALLTHROUGH*/
5179+
/* FALLTHROUGH */
51795180

51805181
case 'g': /* "zg": add good word to word list */
51815182
case 'w': /* "zw": add wrong word to word list */
@@ -8301,7 +8302,7 @@ nv_g_cmd(cmdarg_T *cap)
83018302
/* "g'm" and "g`m": jump to mark without setting pcmark */
83028303
case '\'':
83038304
cap->arg = TRUE;
8304-
/*FALLTHROUGH*/
8305+
/* FALLTHROUGH */
83058306
case '`':
83068307
nv_gomark(cap);
83078308
break;
@@ -8362,7 +8363,7 @@ nv_g_cmd(cmdarg_T *cap)
83628363
case 'q':
83638364
case 'w':
83648365
oap->cursor_start = curwin->w_cursor;
8365-
/*FALLTHROUGH*/
8366+
/* FALLTHROUGH */
83668367
case '~':
83678368
case 'u':
83688369
case 'U':
@@ -9151,7 +9152,7 @@ nv_edit(cmdarg_T *cap)
91519152
* the first column, then it inserts. */
91529153
if (curwin->w_cursor.col == 0)
91539154
break;
9154-
/*FALLTHROUGH*/
9155+
/* FALLTHROUGH */
91559156

91569157
case 'a': /* "a"ppend is like "i"nsert on the next character. */
91579158
#ifdef FEAT_VIRTUALEDIT

0 commit comments

Comments
 (0)