diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-05-30 22:59:36 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-05-30 23:03:21 -0400 |
| commit | 27694577c31eaf17e66b4dbe55d1b7b65c72393f (patch) | |
| tree | 5289cceb7745735438469485ff44835a91b4e01b | |
| parent | 3585df3f0b1ad748c2fbab1d101500e7177aad36 (diff) | |
| download | rneovim-27694577c31eaf17e66b4dbe55d1b7b65c72393f.tar.gz rneovim-27694577c31eaf17e66b4dbe55d1b7b65c72393f.tar.bz2 rneovim-27694577c31eaf17e66b4dbe55d1b7b65c72393f.zip | |
vim-patch:8.0.0321: errors when trying to use scripts in tiny version
Problem: When using the tiny version trying to load the matchit plugin
gives an error. On MS-Windows some default mappings fail.
Solution: Add a check if the command used is available. (Christian Brabandt)
https://github.com/vim/vim/commit/8cc2a9c062fa38e133a62778518f769a423a2526
| -rw-r--r-- | runtime/mswin.vim | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/runtime/mswin.vim b/runtime/mswin.vim index ca280d227c..6dff7e7719 100644 --- a/runtime/mswin.vim +++ b/runtime/mswin.vim @@ -1,7 +1,7 @@ " Set options and add mapping such that Vim behaves a lot like MS-Windows " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last change: 2012 Jul 25 +" Last change: 2017 Feb 09 " bail out if this isn't wanted (mrsvim.vim uses this). if exists("g:skip_loading_mswin") && g:skip_loading_mswin @@ -23,20 +23,22 @@ set backspace=indent,eol,start whichwrap+=<,>,[,] " backspace in Visual mode deletes selection vnoremap <BS> d -" CTRL-X and SHIFT-Del are Cut -vnoremap <C-X> "+x -vnoremap <S-Del> "+x +if has("clipboard") + " CTRL-X and SHIFT-Del are Cut + vnoremap <C-X> "+x + vnoremap <S-Del> "+x -" CTRL-C and CTRL-Insert are Copy -vnoremap <C-C> "+y -vnoremap <C-Insert> "+y + " CTRL-C and CTRL-Insert are Copy + vnoremap <C-C> "+y + vnoremap <C-Insert> "+y -" CTRL-V and SHIFT-Insert are Paste -map <C-V> "+gP -map <S-Insert> "+gP + " CTRL-V and SHIFT-Insert are Paste + map <C-V> "+gP + map <S-Insert> "+gP -cmap <C-V> <C-R>+ -cmap <S-Insert> <C-R>+ + cmap <C-V> <C-R>+ + cmap <S-Insert> <C-R>+ +endif " Pasting blockwise and linewise selections is not possible in Insert and " Visual mode without the +virtualedit feature. They are pasted as if they @@ -44,8 +46,10 @@ cmap <S-Insert> <C-R>+ " Uses the paste.vim autoload script. " Use CTRL-G u to have CTRL-Z only undo the paste. -exe 'inoremap <script> <C-V> <C-G>u' . paste#paste_cmd['i'] -exe 'vnoremap <script> <C-V> ' . paste#paste_cmd['v'] +if 1 + exe 'inoremap <script> <C-V> <C-G>u' . paste#paste_cmd['i'] + exe 'vnoremap <script> <C-V> ' . paste#paste_cmd['v'] +endif imap <S-Insert> <C-V> vmap <S-Insert> <C-V> @@ -99,6 +103,18 @@ inoremap <C-F4> <C-O><C-W>c cnoremap <C-F4> <C-C><C-W>c onoremap <C-F4> <C-C><C-W>c +if has("gui") + " CTRL-F is the search dialog + noremap <C-F> :promptfind<CR> + inoremap <C-F> <C-\><C-O>:promptfind<CR> + cnoremap <C-F> <C-\><C-C>:promptfind<CR> + + " CTRL-H is the replace dialog + noremap <C-H> :promptrepl<CR> + inoremap <C-H> <C-\><C-O>:promptrepl<CR> + cnoremap <C-H> <C-\><C-C>:promptrepl<CR> +endif + " restore 'cpoptions' set cpo& if 1 |