diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-07-03 05:33:48 -0400 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-07-19 15:14:23 -0400 |
| commit | 85b7ea9a8770c42bf2cadb1d3fa605b58d82d7cb (patch) | |
| tree | 2e1a467ff7798a9e52f0851f4ae894cdb19d8a37 /src/nvim/option.c | |
| parent | 4f444ae4f8813a1193dd831049d19f86b5128e93 (diff) | |
| download | rneovim-85b7ea9a8770c42bf2cadb1d3fa605b58d82d7cb.tar.gz rneovim-85b7ea9a8770c42bf2cadb1d3fa605b58d82d7cb.tar.bz2 rneovim-85b7ea9a8770c42bf2cadb1d3fa605b58d82d7cb.zip | |
Remove POSIX 'cpoptions': cleanup
- CPO_ALL and CPO_VI are identical, so merge them
- No longer check for the environment variable 'VIM_POSIX'
- In vim_diff.txt, mention the removal of 'cpoptions' flags
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 113c47f112..e76edcc672 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1724,12 +1724,6 @@ void set_init_1(void) /* Be nocompatible */ p_cp = FALSE; - /* Use POSIX compatibility when $VIM_POSIX is set. */ - if (os_env_exists("VIM_POSIX")) { - set_string_default("cpo", (char_u *)CPO_ALL); - set_string_default("shm", (char_u *)"A"); - } - /* * Find default value for 'shell' option. * Don't use it if it is empty. @@ -4226,7 +4220,7 @@ did_set_string_option ( if (varp == &p_shm) p = (char_u *)SHM_ALL; else if (varp == &(p_cpo)) - p = (char_u *)CPO_ALL; + p = (char_u *)CPO_VI; else if (varp == &(curbuf->b_p_fo)) p = (char_u *)FO_ALL; else if (varp == &curwin->w_p_cocu) |