From 85b7ea9a8770c42bf2cadb1d3fa605b58d82d7cb Mon Sep 17 00:00:00 2001
From: Michael Reed <m.reed@mykolab.com>
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
---
 runtime/doc/vim_diff.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/doc/vim_diff.txt')

diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 557f23dd4b..02edabc944 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -135,6 +135,7 @@ Highlight groups:
   |hl-VisualNOS|
 
 Other options:
+  'cpoptions' ('g', 'w', 'H', '*', '-', 'j', and all POSIX flags were removed)
   'guioptions' (only the 't' flag was removed)
   'guipty'
   'macatsui'
-- 
cgit