commit 8955cef0c6963678994347dbf95ed09fc8e29407
parent 00c4962cd241044c9f02de39b34ca24b2711de43
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 14 Mar 2024 15:31:21 +0800
Merge pull request #27851 from zeertzjq/vim-760f664213de
vim-patch: reverts mswin.vim changes
Diffstat:
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git 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: The Vim Project <https://github.com/vim/vim>
-" Last Change: 2024 Mar 3
+" Last Change: 2024 Mar 13
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Bail out if this isn't wanted.
@@ -27,7 +27,10 @@ set backspace=indent,eol,start whichwrap+=<,>,[,]
" backspace in Visual mode deletes selection
vnoremap <BS> d
-if has("clipboard_working")
+" the better solution would be to use has("clipboard_working"),
+" but that may not be available yet while starting up, so let's just check if
+" clipboard support has been compiled in and assume it will be working :/
+if has("clipboard")
" CTRL-X and SHIFT-Del are Cut
vnoremap <C-X> "+x
vnoremap <S-Del> "+x
@@ -43,7 +46,7 @@ if has("clipboard_working")
cmap <C-V> <C-R>+
cmap <S-Insert> <C-R>+
else
- " Use unnamed register while clipboard not exist
+ " Use the unnamed register when clipboard support not available
" CTRL-X and SHIFT-Del are Cut
vnoremap <C-X> x
@@ -67,7 +70,7 @@ endif
" Uses the paste.vim autoload script.
" Use CTRL-G u to have CTRL-Z only undo the paste.
-if has("clipboard_working")
+if has("clipboard")
exe 'inoremap <script> <C-V> <C-G>u' . paste#paste_cmd['i']
exe 'vnoremap <script> <C-V> ' . paste#paste_cmd['v']
endif
