From 85b7ea9a8770c42bf2cadb1d3fa605b58d82d7cb Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Fri, 3 Jul 2015 05:33:48 -0400 Subject: 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 --- src/nvim/option.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/nvim/option.c') 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) -- cgit