diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | runtime/plugin/gui_shim.vim | 81 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 4 |
4 files changed, 8 insertions, 83 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47e873a845..f5a2987f01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -509,6 +509,11 @@ add_subdirectory(test/includes) add_subdirectory(config) add_subdirectory(test/functional/fixtures) # compile test programs add_subdirectory(runtime) +if(WIN32) + install_helper( + FILES ${DEPS_PREFIX}/share/nvim-qt/runtime/plugin/nvim_gui_shim.vim + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim-qt/runtime/plugin) +endif() # Setup some test-related bits. We do this after going down the tree because we # need some of the targets. diff --git a/runtime/plugin/gui_shim.vim b/runtime/plugin/gui_shim.vim deleted file mode 100644 index 575b826b5e..0000000000 --- a/runtime/plugin/gui_shim.vim +++ /dev/null @@ -1,81 +0,0 @@ -" A Neovim plugin that implements GUI helper commands -if !has('win32') || !has('nvim') || exists('g:GuiLoaded') - finish -endif -let g:GuiLoaded = 1 - -" Close the GUI -function! GuiClose() abort - call rpcnotify(0, 'Gui', 'Close') -endfunction - -" Notify the GUI when exiting Neovim -autocmd VimLeave * call GuiClose() - -" A replacement for foreground() -function! GuiForeground() abort - call rpcnotify(0, 'Gui', 'Foreground') -endfunction - -" Set maximized state for GUI window (1 is enabled, 0 disabled) -function! GuiWindowMaximized(enabled) abort - call rpcnotify(0, 'Gui', 'WindowMaximized', a:enabled) -endfunction - -" Set fullscreen state for GUI window (1 is enabled, 0 disabled) -function! GuiWindowFullScreen(enabled) abort - call rpcnotify(0, 'Gui', 'WindowFullScreen', a:enabled) -endfunction - -" Set GUI font -function! GuiFont(fname, ...) abort - let force = get(a:000, 0, 0) - call rpcnotify(0, 'Gui', 'Font', a:fname, force) -endfunction - -" Set additional linespace -function! GuiLinespace(height) abort - call rpcnotify(0, 'Gui', 'Linespace', a:height) -endfunction - -" Configure mouse hide behaviour (1 is enabled, 0 disabled) -function! GuiMousehide(enabled) abort - call rpcnotify(0, 'Gui', 'Mousehide', a:enabled) -endfunction - -" The GuiFont command. For compatibility there is also Guifont -function s:GuiFontCommand(fname, bang) abort - if a:fname ==# '' - if exists('g:GuiFont') - echo g:GuiFont - else - echo 'No GuiFont is set' - endif - else - call GuiFont(a:fname, a:bang ==# '!') - endif -endfunction -command! -nargs=? -bang Guifont call s:GuiFontCommand("<args>", "<bang>") -command! -nargs=? -bang GuiFont call s:GuiFontCommand("<args>", "<bang>") - -function s:GuiLinespaceCommand(height) abort - if a:height ==# '' - if exists('g:GuiLinespace') - echo g:GuiLinespace - else - echo 'No GuiLinespace is set' - endif - else - call GuiLinespace(a:height) - endif -endfunction -command! -nargs=? GuiLinespace call s:GuiLinespaceCommand("<args>") - -" GuiDrop('file1', 'file2', ...) is similar to :drop file1 file2 ... -" but it calls fnameescape() over all arguments -function GuiDrop(...) - let l:fnames = deepcopy(a:000) - let l:args = map(l:fnames, 'fnameescape(v:val)') - exec 'drop '.join(l:args, ' ') - doautocmd BufEnter -endfunction diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 4bfcbf8e79..cd7a6cbc9c 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -89,6 +89,7 @@ NEW_TESTS ?= \ test_profile.res \ test_put.res \ test_quickfix.res \ + Test_quotestar.res \ test_recover.res \ test_retab.res \ test_scrollbind.res \ diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 30503e3c4a..6a9a029b1d 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -108,8 +108,8 @@ include(ExternalProject) set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.12.0.tar.gz) set(LIBUV_SHA256 41ce914a88da21d3b07a76023beca57576ca5b376c6ac440c80bc581cbca1250) -set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-2.1.5/msgpack-2.1.5.tar.gz) -set(MSGPACK_SHA256 6126375af9b204611b9d9f154929f4f747e4599e6ae8443b337915dcf2899d2b) +set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-3.0.0/msgpack-3.0.0.tar.gz) +set(MSGPACK_SHA256 bfbb71b7c02f806393bc3cbc491b40523b89e64f83860c58e3e54af47de176e4) set(LUAJIT_URL https://github.com/LuaJIT/LuaJIT/archive/7dbf0b05f1228c1c719866db5e5f3d58f87f74c8.tar.gz) set(LUAJIT_SHA256 cbae019b5e396164eb5f0d07777b55cc03931bb944f83c61a010c053c9f5fd5b) |