diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-08-02 09:24:24 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-08-02 09:24:24 +0800 |
| commit | b16a4ad49a010a8a2f1019394396fee5facbbd16 (patch) | |
| tree | 8ac26ac0549434c20acb12ca6e939c555b710069 /src/nvim/eval.c | |
| parent | 7c7039767aa4d715aea997721b0d759b308a43d4 (diff) | |
| parent | 27356de2697ca542ded05ea6c2017a3ca738084f (diff) | |
| download | rneovim-b16a4ad49a010a8a2f1019394396fee5facbbd16.tar.gz rneovim-b16a4ad49a010a8a2f1019394396fee5facbbd16.tar.bz2 rneovim-b16a4ad49a010a8a2f1019394396fee5facbbd16.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 2988225110..78c8dd02db 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -19546,18 +19546,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; } |