diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-07-31 02:50:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-31 02:50:34 +0200 |
| commit | b5e713e70d2db3017e9582c6165f2f62eb112826 (patch) | |
| tree | b3ad34491e83c30d4d13d3822aa5d3bc21f3c60a /src | |
| parent | 13e8356f52d9dc1da96179ee425168740874c8c7 (diff) | |
| download | rneovim-b5e713e70d2db3017e9582c6165f2f62eb112826.tar.gz rneovim-b5e713e70d2db3017e9582c6165f2f62eb112826.tar.bz2 rneovim-b5e713e70d2db3017e9582c6165f2f62eb112826.zip | |
options: remove ghost of `:set termcap` (#7102)
Closes #6763
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 18 | ||||
| -rw-r--r-- | src/nvim/option.c | 8 |
2 files changed, 13 insertions, 13 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; } diff --git a/src/nvim/option.c b/src/nvim/option.c index 98ca72b2bb..8ba10fd38a 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1185,10 +1185,6 @@ do_set ( showoptions(1, opt_flags); did_show = TRUE; } - } else if (STRNCMP(arg, "termcap", - 7) == 0 && !(opt_flags & OPT_MODELINE)) { - did_show = TRUE; - arg += 7; } else { prefix = 1; if (STRNCMP(arg, "no", 2) == 0) { @@ -6070,8 +6066,8 @@ int ExpandSettings(expand_T *xp, regmatch_T *regmatch, int *num_file, char_u *** int count = 0; char_u *str; int loop; - static char *(names[]) = {"all", "termcap"}; - int ic = regmatch->rm_ic; /* remember the ignore-case flag */ + static char *(names[]) = { "all" }; + int ic = regmatch->rm_ic; // remember the ignore-case flag /* do this loop twice: * loop == 0: count the number of matching options |