Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions doc/diffs.nvim.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ Configuration is done via `vim.g.diffs`. Set options before the plugin loads:
See |diffs.nvim-diffopt|.
See |diffs.nvim.IntraConfig| for fields.

{overrides} (table, default: {})
Deprecated. See |diffs.nvim-highlights|.

*diffs.nvim.TreesitterConfig*
Treesitter config fields: ~
{max_lines} (integer, default: 500)
Expand Down Expand Up @@ -1424,20 +1421,18 @@ Diff mode window highlights: ~ These are used for 'winhighlight' remapping in
*DiffsDiffText*
DiffsDiffText Background-only replacement for `DiffText`.

After diffs.nvim initializes, customize with |nvim_set_hl()| and
|ColorScheme|: >lua
local function set_highlights()
vim.api.nvim_set_hl(0, 'DiffsAdd', { bg = '#2e4a3a' })
vim.api.nvim_set_hl(0, 'DiffsDiffDelete', { link = 'DiffDelete' })
end

vim.api.nvim_create_autocmd('ColorScheme', {
group = vim.api.nvim_create_augroup('MyDiffsHighlights', { clear = true }),
*DiffsHighlights*
diffs.nvim triggers `User DiffsHighlights` after each highlight update, including
initialization and |ColorScheme| changes. Register this autocmd before loading
diffs.nvim to apply your colors after each update: >lua
vim.api.nvim_create_autocmd('User', {
pattern = 'DiffsHighlights',
group = vim.api.nvim_create_augroup('my_diffs_highlights', { clear = true }),
callback = function()
vim.schedule(set_highlights)
vim.api.nvim_set_hl(0, 'DiffsAdd', { bg = '#2e4a3a' })
vim.api.nvim_set_hl(0, 'DiffsDiffDelete', { link = 'DiffDelete' })
end,
})
vim.schedule(set_highlights)
<

==============================================================================
Expand Down
1 change: 0 additions & 1 deletion lua/diffs/config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ local integration_metadata = require('diffs.integrations')
---@class diffs.Highlights
---@field background boolean
---@field blend_alpha? number
---@field overrides? table<string, table>
---@field warn_max_lines boolean
---@field treesitter diffs.TreesitterConfig
---@field vim diffs.VimConfig|false
Expand Down
6 changes: 1 addition & 5 deletions lua/diffs/runtime/highlight_groups.lua
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,7 @@ function M.apply(config, is_default)
vim.api.nvim_set_hl(0, 'NeogitDiffDeleteInline', {})
end

if config.highlights.overrides then
for group, hl in pairs(config.highlights.overrides) do
vim.api.nvim_set_hl(0, group, hl)
end
end
vim.api.nvim_exec_autocmds('User', { pattern = 'DiffsHighlights', modeline = false })

return { transparent = transparent }
end
Expand Down
8 changes: 0 additions & 8 deletions lua/diffs/runtime/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@ local function init()
end
log.set_enabled(config.debug)

if config.highlights.overrides and next(config.highlights.overrides) then
log.notify(
'highlights.overrides is deprecated. Support ends on November 30, 2026. '
.. 'Use vim.api.nvim_set_hl(). See :help diffs.nvim-highlights.',
vim.log.levels.WARN
)
end

if config.highlights.intra and config.highlights.intra.algorithm == 'vscode' then
log.notify(
'libvscodediff support will be removed on 30 November 2026. '
Expand Down
Loading