aboutsummaryrefslogtreecommitdiff
path: root/runtime/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/plugin')
-rw-r--r--runtime/plugin/matchparen.vim7
-rw-r--r--runtime/plugin/netrwPlugin.vim4
-rw-r--r--runtime/plugin/nvim.lua24
3 files changed, 7 insertions, 28 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index 4235a0d39b..6c061c9fb8 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,6 @@
" Vim plugin for showing matching parens
" Maintainer: The Vim Project <https://github.com/vim/vim>
-" Last Change: 2023 Oct 20
+" Last Change: 2024 May 18
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Exit quickly when:
@@ -22,7 +22,8 @@ let s:has_matchaddpos = exists('*matchaddpos')
augroup matchparen
" Replace all matchparen autocommands
- autocmd! CursorMoved,CursorMovedI,WinEnter,BufWinEnter,WinScrolled * call s:Highlight_Matching_Pair()
+ autocmd! CursorMoved,CursorMovedI,WinEnter,WinScrolled * call s:Highlight_Matching_Pair()
+ autocmd! BufWinEnter * autocmd SafeState * ++once call s:Highlight_Matching_Pair()
autocmd! WinLeave,BufLeave * call s:Remove_Matches()
if exists('##TextChanged')
autocmd! TextChanged,TextChangedI * call s:Highlight_Matching_Pair()
@@ -217,7 +218,7 @@ command NoMatchParen call s:NoMatchParen()
func s:NoMatchParen()
let w = winnr()
- noau windo silent! call matchdelete(3)
+ noau windo call s:Remove_Matches()
unlet! g:loaded_matchparen
exe "noau ". w . "wincmd w"
au! matchparen
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index ed6f7dc008..c70e6518ff 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -2,6 +2,8 @@
" PLUGIN SECTION
" Maintainer: This runtime file is looking for a new maintainer.
" Date: Feb 09, 2021
+" Last Change:
+" 2024 May 08 by Vim Project: cleanup legacy Win9X checks
" Former Maintainer: Charles E Campbell
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 1999-2021 Charles E. Campbell {{{1
@@ -35,7 +37,7 @@ augroup FileExplorer
au BufLeave * if &ft != "netrw"|let w:netrw_prvfile= expand("%:p")|endif
au BufEnter * sil call s:LocalBrowse(expand("<amatch>"))
au VimEnter * sil call s:VimEnter(expand("<amatch>"))
- if has("win32") || has("win95") || has("win64") || has("win16")
+ if has("win32")
au BufEnter .* sil call s:LocalBrowse(expand("<amatch>"))
endif
augroup END
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
deleted file mode 100644
index 743d3044b6..0000000000
--- a/runtime/plugin/nvim.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-vim.api.nvim_create_user_command('Inspect', function(cmd)
- if cmd.bang then
- vim.print(vim.inspect_pos())
- else
- vim.show_pos()
- end
-end, { desc = 'Inspect highlights and extmarks at the cursor', bang = true })
-
-vim.api.nvim_create_user_command('InspectTree', function(cmd)
- if cmd.mods ~= '' or cmd.count ~= 0 then
- local count = cmd.count ~= 0 and cmd.count or ''
- local new = cmd.mods ~= '' and 'new' or 'vnew'
-
- vim.treesitter.inspect_tree({
- command = ('%s %s%s'):format(cmd.mods, count, new),
- })
- else
- vim.treesitter.inspect_tree()
- end
-end, { desc = 'Inspect treesitter language tree for buffer', count = true })
-
-vim.api.nvim_create_user_command('EditQuery', function(cmd)
- vim.treesitter.query.edit(cmd.fargs[1])
-end, { desc = 'Edit treesitter query', nargs = '?' })