diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-07-31 13:13:14 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-07-31 13:13:14 +0300 |
| commit | a356d3c89567dc13c5de70d33e5bcc534bf4c6cb (patch) | |
| tree | 7e0b7c3902641378056e9c21abb6a1122d2c5dd7 /src/nvim/option.c | |
| parent | fbe60af538aa6c723779ae7a816de845460619ae (diff) | |
| parent | 27356de2697ca542ded05ea6c2017a3ca738084f (diff) | |
| download | rneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.tar.gz rneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.tar.bz2 rneovim-a356d3c89567dc13c5de70d33e5bcc534bf4c6cb.zip | |
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 8 |
1 files changed, 2 insertions, 6 deletions
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 |