fix: update diffopt
This commit is contained in:
+9
-13
@@ -54,19 +54,15 @@ vim.opt.virtualedit = "block"
|
|||||||
vim.opt.termguicolors = true
|
vim.opt.termguicolors = true
|
||||||
vim.opt.signcolumn = "yes:2"
|
vim.opt.signcolumn = "yes:2"
|
||||||
-- Diff options
|
-- Diff options
|
||||||
vim.opt.diffopt = {}
|
vim.opt.diffopt = {
|
||||||
-- Use vertical split by default
|
"vertical",
|
||||||
vim.opt.diffopt:append("vertical")
|
"filler",
|
||||||
-- Insert filler lines
|
"closeoff",
|
||||||
vim.opt.diffopt:append("filler")
|
"internal",
|
||||||
-- Execute :diffoff when only one diff window remain
|
"indent-heuristic",
|
||||||
vim.opt.diffopt:append("closeoff")
|
"algorithm:histogram",
|
||||||
-- Use internal diff library
|
"linematch:60",
|
||||||
vim.opt.diffopt:append("internal")
|
}
|
||||||
-- These make diffs easier to read, please see the following:
|
|
||||||
-- https://vimways.org/2018/the-power-of-diff/
|
|
||||||
vim.opt.diffopt:append({ "indent-heuristic", "algorithm:histogram" })
|
|
||||||
vim.opt.diffopt:append("linematch:40")
|
|
||||||
vim.opt.hlsearch = true
|
vim.opt.hlsearch = true
|
||||||
vim.opt.laststatus = 2
|
vim.opt.laststatus = 2
|
||||||
vim.opt.textwidth = 0
|
vim.opt.textwidth = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user