diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-07-03 03:35:39 -0400 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-07-19 15:14:22 -0400 |
| commit | b19afa52c4ee679f62b5e7679694241f9a09ccba (patch) | |
| tree | ddca9ba66226eaba8dbbc981a5c293516bd47fb8 /src | |
| parent | d9b053d6a6fe95d230004c4c75d91a5e87119259 (diff) | |
| download | rneovim-b19afa52c4ee679f62b5e7679694241f9a09ccba.tar.gz rneovim-b19afa52c4ee679f62b5e7679694241f9a09ccba.tar.bz2 rneovim-b19afa52c4ee679f62b5e7679694241f9a09ccba.zip | |
Remove POSIX 'cpoptions': '&'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/memline.c | 3 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index f11dc636a3..53f9a544b4 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -587,8 +587,7 @@ void ml_close(buf_T *buf, int del_file) void ml_close_all(int del_file) { FOR_ALL_BUFFERS(buf) { - ml_close(buf, del_file && ((buf->b_flags & BF_PRESERVED) == 0 - || vim_strchr(p_cpo, CPO_PRESERVE) == NULL)); + ml_close(buf, del_file && ((buf->b_flags & BF_PRESERVED) == 0)); } spell_delete_wordlist(); /* delete the internal wordlist */ vim_deltempdir(); /* delete created temp directory */ diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 3d59a28e04..02a16a1a60 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -129,7 +129,6 @@ #define CPO_SPECI '<' /* don't recognize <> in mappings */ #define CPO_REGAPPEND '>' /* insert NL when appending to a register */ /* POSIX flags */ -#define CPO_PRESERVE '&' /* keep swap file after :preserve */ #define CPO_SUBPERCENT '/' /* % in :s string uses previous one */ #define CPO_BACKSL '\\' /* \ is not special in [] */ #define CPO_CHDIR '.' /* don't chdir if buffer is modified */ @@ -139,7 +138,7 @@ #define CPO_VIM "aABceFs" #define CPO_VI "aAbBcCdDeEfFiIJkKlLmMnoOpPqrRsStuvWxXyZ$!%+<>;" #define CPO_ALL \ - "aAbBcCdDeEfFiIJkKlLmMnoOpPqrRsStuvWxXyZ$!%+<>&/\\.;" + "aAbBcCdDeEfFiIJkKlLmMnoOpPqrRsStuvWxXyZ$!%+<>/\\.;" /* characters for p_ww option: */ #define WW_ALL "bshl<>[],~" |