diff options
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 44d697d30f..ba6876598f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1964,10 +1964,6 @@ A jump table for the options with a short description can be found at |Q_op|. buffer is modified, unless ! is used. Vim doesn't need this, since it remembers the full path of an opened file. - *cpo-bar* - | The value of the $LINES and $COLUMNS environment - variables overrule the terminal size values obtained - with system specific functions. *'cryptmethod'* *'cm'* 'cryptmethod' Removed. |vim-differences| {Nvim} diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index e292f44b9a..3d59a28e04 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_TSIZE '|' /* $LINES and $COLUMNS overrule term size */ #define CPO_PRESERVE '&' /* keep swap file after :preserve */ #define CPO_SUBPERCENT '/' /* % in :s string uses previous one */ #define CPO_BACKSL '\\' /* \ is not special in [] */ @@ -140,7 +139,7 @@ #define CPO_VIM "aABceFs" #define CPO_VI "aAbBcCdDeEfFiIJkKlLmMnoOpPqrRsStuvWxXyZ$!%+<>;" #define CPO_ALL \ - "aAbBcCdDeEfFiIJkKlLmMnoOpPqrRsStuvWxXyZ$!%+<>|&/\\.;" + "aAbBcCdDeEfFiIJkKlLmMnoOpPqrRsStuvWxXyZ$!%+<>&/\\.;" /* characters for p_ww option: */ #define WW_ALL "bshl<>[],~" |