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/option.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/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 |