ex_docmd: Fix code style in ex_match

This commit is contained in:
Jurica Bradaric
2016-02-21 11:21:20 +01:00
parent 29b393e43a
commit 82293b94c3

View File

@@ -9352,11 +9352,9 @@ static void ex_nohlsearch(exarg_T *eap)
redraw_all_later(SOME_VALID); redraw_all_later(SOME_VALID);
} }
/* // ":[N]match {group} {pattern}"
* ":[N]match {group} {pattern}" // Sets nextcmd to the start of the next command, if any. Also called when
* Sets nextcmd to the start of the next command, if any. Also called when // skipping commands to find the next command.
* skipping commands to find the next command.
*/
static void ex_match(exarg_T *eap) static void ex_match(exarg_T *eap)
{ {
char_u *p; char_u *p;
@@ -9365,26 +9363,28 @@ static void ex_match(exarg_T *eap)
int c; int c;
int id; int id;
if (eap->line2 <= 3) if (eap->line2 <= 3) {
id = eap->line2; id = eap->line2;
else { } else {
EMSG(e_invcmd); EMSG(e_invcmd);
return; return;
} }
/* First clear any old pattern. */ // First clear any old pattern.
if (!eap->skip) if (!eap->skip) {
match_delete(curwin, id, FALSE); match_delete(curwin, id, false);
}
if (ends_excmd(*eap->arg)) if (ends_excmd(*eap->arg)) {
end = eap->arg; end = eap->arg;
else if ((STRNICMP(eap->arg, "none", 4) == 0 } else if ((STRNICMP(eap->arg, "none", 4) == 0
&& (ascii_iswhite(eap->arg[4]) || ends_excmd(eap->arg[4])))) && (ascii_iswhite(eap->arg[4]) || ends_excmd(eap->arg[4])))) {
end = eap->arg + 4; end = eap->arg + 4;
else { } else {
p = skiptowhite(eap->arg); p = skiptowhite(eap->arg);
if (!eap->skip) if (!eap->skip) {
g = vim_strnsave(eap->arg, (int)(p - eap->arg)); g = vim_strnsave(eap->arg, (int)(p - eap->arg));
}
p = skipwhite(p); p = skipwhite(p);
if (*p == NUL) { if (*p == NUL) {
// There must be two arguments. // There must be two arguments.
@@ -9392,7 +9392,7 @@ static void ex_match(exarg_T *eap)
EMSG2(_(e_invarg2), eap->arg); EMSG2(_(e_invarg2), eap->arg);
return; return;
} }
end = skip_regexp(p + 1, *p, TRUE, NULL); end = skip_regexp(p + 1, *p, true, NULL);
if (!eap->skip) { if (!eap->skip) {
if (*end != NUL && !ends_excmd(*skipwhite(end + 1))) { if (*end != NUL && !ends_excmd(*skipwhite(end + 1))) {
xfree(g); xfree(g);