aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-07-31 13:13:14 +0300
committerZyX <kp-pav@yandex.ru>2017-07-31 13:13:14 +0300
commita356d3c89567dc13c5de70d33e5bcc534bf4c6cb (patch)
tree7e0b7c3902641378056e9c21abb6a1122d2c5dd7 /src/nvim/eval.c
parentfbe60af538aa6c723779ae7a816de845460619ae (diff)
parent27356de2697ca542ded05ea6c2017a3ca738084f (diff)
downloadrneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.tar.gz
rneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.tar.bz2
rneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.zip
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 40847fb806..cc48cbbc43 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -19551,18 +19551,22 @@ static const char *find_option_end(const char **const arg, int *const opt_flags)
} else if (*p == 'l' && p[1] == ':') {
*opt_flags = OPT_LOCAL;
p += 2;
- } else
+ } else {
*opt_flags = 0;
+ }
- if (!ASCII_ISALPHA(*p))
+ if (!ASCII_ISALPHA(*p)) {
return NULL;
+ }
*arg = p;
- if (p[0] == 't' && p[1] == '_' && p[2] != NUL && p[3] != NUL)
- p += 4; /* termcap option */
- else
- while (ASCII_ISALPHA(*p))
- ++p;
+ if (p[0] == 't' && p[1] == '_' && p[2] != NUL && p[3] != NUL) {
+ p += 4; // t_xx/termcap option
+ } else {
+ while (ASCII_ISALPHA(*p)) {
+ p++;
+ }
+ }
return p;
}