diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-01 17:33:32 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-04-01 17:42:15 +0200 |
| commit | 33ff29fc740fd437f1600d8ccc60b7b484d78d19 (patch) | |
| tree | 78c56a57359c8ffde5e613ed8a641e6134bd3058 /runtime/doc/vim_diff.txt | |
| parent | 8de53157b691dd4ce604a5be0e2d9c3b6014bfdb (diff) | |
| parent | 45a13c4bbc4a7c4f62a299c832ecc192d8f3cd0a (diff) | |
| download | rneovim-33ff29fc740fd437f1600d8ccc60b7b484d78d19.tar.gz rneovim-33ff29fc740fd437f1600d8ccc60b7b484d78d19.tar.bz2 rneovim-33ff29fc740fd437f1600d8ccc60b7b484d78d19.zip | |
Merge #6344 'vim-patch:7.4.2236,7.4.2306'
Diffstat (limited to 'runtime/doc/vim_diff.txt')
| -rw-r--r-- | runtime/doc/vim_diff.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 11dde27868..41c0c41c80 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -45,7 +45,8 @@ these differences. - 'history' defaults to 10000 (the maximum) - 'hlsearch' is set by default - 'incsearch' is set by default -- 'langnoremap' is set by default +- 'langnoremap' is enabled by default +- 'langremap' is disabled by default - 'laststatus' defaults to 2 (statusline is always shown) - 'listchars' defaults to "tab:> ,trail:-,nbsp:+" - 'nocompatible' is always set |