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 | |
| 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')
| -rw-r--r-- | runtime/doc/deprecated.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt index 822019340a..e77d20172e 100644 --- a/runtime/doc/deprecated.txt +++ b/runtime/doc/deprecated.txt @@ -44,6 +44,7 @@ Functions ~ Options ~ *'fe'* 'fenc'+'enc' before Vim 6.0; no longer used. +*'langnoremap'* Deprecated alias to 'nolangremap'. *'vi'* *'viminfo'* Deprecated alias to 'shada' option. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c31ebf4ebc..7d41162cfc 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3762,12 +3762,12 @@ A jump table for the options with a short description can be found at |Q_op|. :source $VIMRUNTIME/menu.vim < Warning: This deletes all menus that you defined yourself! - *'langnoremap'* *'lnr'* -'langnoremap' 'lnr' boolean (default on) + *'langremap'* *'lrm'* *'nolangremap'* *'nolrm'* +'langremap' 'lrm' boolean (default off) global - When on, setting 'langmap' does not apply to characters resulting from + When off, setting 'langmap' does not apply to characters resulting from a mapping. If setting 'langmap' disables some of your mappings, make - sure this option is set. + sure this option is off. *'laststatus'* *'ls'* 'laststatus' 'ls' number (default 2) 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 |