Baipyrus/nvim-config
1
0
Fork 0
mirror of https://github.com/Baipyrus/nvim-config.git synced 2024-12-25 04:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

group conflict-marker.vim autocmds in one

Browse Source
This commit is contained in:
Baipyrus 2024-10-17 10:54:36 +02:00
parent 5795aa73ef
commit 5febea0f8a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua/custom/plugins/conflictmarker.lua
View File

@ -32,15 +32,10 @@ return {
end
-- Autocommand to disable diagnostics on buffer enter
vim.api.nvim_create_autocmd('BufRead', {
vim.api.nvim_create_autocmd({ 'BufRead', 'BufWritePre' }, {
group = vim.api.nvim_create_augroup('git-conflict-lsp-disable', { clear = true }),
callback = git_conflict_detection,
})
-- Autocommand to disable diagnostics on save
vim.api.nvim_create_autocmd('BufWritePre', {
group = vim.api.nvim_create_augroup('git-conflict-lsp-disable', { clear = false }),
callback = git_conflict_detection,
})
end,
},
}