averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master'

Browse Source
This commit is contained in:
Kazuki Sakamoto
2017-10-24 17:48:41 -07:00
parent 381aa9a77f 6ce6504808
commit 96b4e927fb
15 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/buffer.c
+2
View File
@@ -4335,6 +4335,7 @@ build_stl_str_hl(
case STL_OFFSET_X:
base = 'X';
/* FALLTHROUGH */
case STL_OFFSET:
#ifdef FEAT_BYTEOFF
l = ml_find_line_or_offset(wp->w_buffer, wp->w_cursor.lnum, NULL);
@@ -4346,6 +4347,7 @@ build_stl_str_hl(
case STL_BYTEVAL_X:
base = 'X';
/* FALLTHROUGH */
case STL_BYTEVAL:
num = byteval;
if (num == NL)
src/edit.c
+4 -1
View File
@@ -984,7 +984,7 @@ edit(
case ESC: /* End input mode */
if (echeck_abbr(ESC + ABBR_OFF))
break;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case Ctrl_C: /* End input mode */
#ifdef FEAT_CMDWIN
@@ -5788,13 +5788,16 @@ 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 */
case '~':
if (!p_magic) /* quote these only if magic is set */
break;
/* FALLTHROUGH */
case '\\':
if (ctrl_x_mode == CTRL_X_DICTIONARY
|| ctrl_x_mode == CTRL_X_THESAURUS)
break;
/* FALLTHROUGH */
case '^': /* currently it's not needed. */
case '$':
m++;
src/eval.c
+2 -2
View File
@@ -6995,7 +6995,7 @@ free_tv(typval_T *varp)
{
case VAR_FUNC:
func_unref(varp->vval.v_string);
/*FALLTHROUGH*/
/* FALLTHROUGH */
case VAR_STRING:
vim_free(varp->vval.v_string);
break;
@@ -7040,7 +7040,7 @@ clear_tv(typval_T *varp)
{
case VAR_FUNC:
func_unref(varp->vval.v_string);
/*FALLTHROUGH*/
/* FALLTHROUGH */
case VAR_STRING:
vim_free(varp->vval.v_string);
varp->vval.v_string = NULL;
src/ex_cmds.c
+1
View File
@@ -3002,6 +3002,7 @@ ex_file(exarg_T *eap)
/* print full file name if :cd used */
if (!shortmess(SHM_FILEINFO))
fileinfo(FALSE, FALSE, eap->forceit);
redraw_tabline = TRUE;
}
/*
src/ex_docmd.c
+1 -1
View File
@@ -4122,7 +4122,7 @@ set_one_cmd_context(
case CMD_bunload:
while ((xp->xp_pattern = vim_strchr(arg, ' ')) != NULL)
arg = xp->xp_pattern + 1;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case CMD_buffer:
case CMD_sbuffer:
case CMD_checktime:
src/ex_getln.c
+1 -2
View File
@@ -1571,9 +1571,8 @@ getcmdline(
break;
goto cmdline_not_changed;
}
/* FALLTHROUGH */
#ifdef FEAT_CMDHIST
/* FALLTHROUGH */
case K_UP:
case K_DOWN:
case K_S_UP:
src/if_perl.xs
+1
View File
@@ -1101,6 +1101,7 @@ perl_to_vim(SV *sv, typval_T *rettv)
rettv->vval.v_number = SvIV(sv);
break;
}
/* FALLTHROUGH */
case SVt_PV: /* string */
{
size_t len = 0;
src/main.c
+2 -2
View File
@@ -2312,7 +2312,7 @@ command_line_scan(mparm_T *parmp)
argv_idx = -1;
break;
}
/*FALLTHROUGH*/
/* FALLTHROUGH */
case 'S': /* "-S {file}" execute Vim script */
case 'i': /* "-i {viminfo}" use for viminfo */
#ifndef FEAT_DIFF
@@ -2470,7 +2470,7 @@ scripterror:
argv_idx = -1;
break;
}
/*FALLTHROUGH*/
/* FALLTHROUGH */
case 'W': /* "-W {scriptout}" overwrite script file */
if (scriptout != NULL)
goto scripterror;
src/message.c
+3 -2
View File
@@ -670,7 +670,8 @@ emsg(char_u *s)
ex_exitval = 1;
/* Reset msg_silent, an error causes messages to be switched back on. */
/* Reset msg_silent, an error causes messages to be switched back on.
*/
msg_silent = 0;
cmd_silent = FALSE;
@@ -2841,7 +2842,7 @@ 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:
src/normal.c
+5 -4
View File
@@ -1945,6 +1945,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
AppendToRedobuff((char_u *)"!\r"); /* use any last used !cmd */
else
bangredo = TRUE; /* do_bang() will put cmd in redo buffer */
/* FALLTHROUGH */
case OP_INDENT:
case OP_COLON:
@@ -5175,7 +5176,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 */
@@ -8301,7 +8302,7 @@ 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;
@@ -8362,7 +8363,7 @@ nv_g_cmd(cmdarg_T *cap)
case 'q':
case 'w':
oap->cursor_start = curwin->w_cursor;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case '~':
case 'u':
case 'U':
@@ -9151,7 +9152,7 @@ nv_edit(cmdarg_T *cap)
* the first column, then it inserts. */
if (curwin->w_cursor.col == 0)
break;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case 'a': /* "a"ppend is like "i"nsert on the next character. */
#ifdef FEAT_VIRTUALEDIT
src/regexp.c
+6 -6
View File
@@ -1997,7 +1997,7 @@ regatom(int *flagp)
goto collection;
/* "\_x" is character class plus newline */
/*FALLTHROUGH*/
/* FALLTHROUGH */
/*
* Character classes.
@@ -5847,7 +5847,7 @@ regrepeat(
case IDENT:
case IDENT + ADD_NL:
testval = TRUE;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case SIDENT:
case SIDENT + ADD_NL:
while (count < maxcount)
@@ -5877,7 +5877,7 @@ regrepeat(
case KWORD:
case KWORD + ADD_NL:
testval = TRUE;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case SKWORD:
case SKWORD + ADD_NL:
while (count < maxcount)
@@ -5908,7 +5908,7 @@ regrepeat(
case FNAME:
case FNAME + ADD_NL:
testval = TRUE;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case SFNAME:
case SFNAME + ADD_NL:
while (count < maxcount)
@@ -5938,7 +5938,7 @@ regrepeat(
case PRINT:
case PRINT + ADD_NL:
testval = TRUE;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case SPRINT:
case SPRINT + ADD_NL:
while (count < maxcount)
@@ -6131,7 +6131,7 @@ do_class:
case ANYOF:
case ANYOF + ADD_NL:
testval = TRUE;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case ANYBUT:
case ANYBUT + ADD_NL:
src/regexp_nfa.c
+2 -1
View File
@@ -1320,7 +1320,7 @@ nfa_regatom(void)
goto collection;
/* "\_x" is character class plus newline */
/*FALLTHROUGH*/
/* FALLTHROUGH */
/*
* Character classes.
@@ -4698,6 +4698,7 @@ skip_add:
subs = addstate(l, state->out, subs, pim, off_arg);
break;
}
/* FALLTHROUGH */
case NFA_MCLOSE1:
case NFA_MCLOSE2:
case NFA_MCLOSE3:
src/spell.c
+6 -6
View File
@@ -5019,7 +5019,7 @@ suggest_trie_walk(
}
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_PLAIN;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case STATE_PLAIN:
/*
@@ -5243,7 +5243,7 @@ suggest_trie_walk(
}
break;
}
/*FALLTHROUGH*/
/* FALLTHROUGH */
case STATE_INS_PREP:
if (sp->ts_flags & TSF_DIDDEL)
@@ -5277,7 +5277,7 @@ suggest_trie_walk(
}
break;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case STATE_INS:
/* Insert one byte. Repeat this for each possible byte at this
@@ -5464,7 +5464,7 @@ suggest_trie_walk(
*p = p[1];
p[1] = c;
}
/*FALLTHROUGH*/
/* FALLTHROUGH */
case STATE_SWAP3:
/* Swap two bytes, skipping one: "123" -> "321". We change
@@ -5703,7 +5703,7 @@ suggest_trie_walk(
p[1] = p[2];
p[2] = c;
}
/*FALLTHROUGH*/
/* FALLTHROUGH */
case STATE_REP_INI:
/* Check if matching with REP items from the .aff file would work.
@@ -5736,7 +5736,7 @@ suggest_trie_walk(
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP;
/*FALLTHROUGH*/
/* FALLTHROUGH */
case STATE_REP:
/* Try matching with REP items from the .aff file. For each match
src/version.c
+4
View File
@@ -776,6 +776,10 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1216,
/**/
1215,
/**/
1214,
/**/
src/window.c
+2 -2
View File
@@ -433,8 +433,8 @@ newwindow:
g_do_tagpreview = Prenum;
else
g_do_tagpreview = p_pvh;
/*FALLTHROUGH*/
#endif
/* FALLTHROUGH */
case ']':
case Ctrl_RSB:
CHECK_CMDWIN
@@ -557,8 +557,8 @@ wingotofile:
g_do_tagpreview = Prenum;
else
g_do_tagpreview = p_pvh;
/*FALLTHROUGH*/
#endif
/* FALLTHROUGH */
case ']':
case Ctrl_RSB:
/* keep Visual mode, can select words to use as a tag */