diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-14 13:37:29 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2024-03-14 15:03:47 +0800 |
| commit | ff972b88db89927c8e0c1a5d76c999bb80636d92 (patch) | |
| tree | cb86f42d88eff0a7322a8719620c5e1c0fddae85 | |
| parent | 00c4962cd241044c9f02de39b34ca24b2711de43 (diff) | |
| download | rneovim-ff972b88db89927c8e0c1a5d76c999bb80636d92.tar.gz rneovim-ff972b88db89927c8e0c1a5d76c999bb80636d92.tar.bz2 rneovim-ff972b88db89927c8e0c1a5d76c999bb80636d92.zip | |
vim-patch:760f664213de
runtime(mswin): revert back the check for clipboard_working support
Commit d9ebd46bd090c598adc82e6 changed the condition to
check if the clipboard is available from:
```
has('clipboard')
```
to
```
has('clipboard_working')
```
Assuming that is the more accurate test because even when clipboard
support is enabled at compile time it may not be actually working (e.g.
if no X11 environment is available, or when working on a remote server).
However it seems that condition does not evaluate to true, when the GUI
has not been started up yet (and there was no X11 Connection yet possible).
So let's just revert back the check to `has('clipboard')`, since that
has been proven to be working well enough.
related: vim/vim#13809
https://github.com/vim/vim/commit/760f664213dea9a300454992ba1589f4601d622f
Co-authored-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/mswin.vim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/mswin.vim b/runtime/mswin.vim index 107a2acc2e..d419146958 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: 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 |