diff --git a/README.md b/README.md index 2a7bd73..eee728d 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,11 @@ with language-aware syntax highlighting. [vscode-diff](https://github.com/esmuellert/codediff.nvim) FFI backend for word-level accuracy) - `:Gdiff` unified diff against any revision +- Background-only diff colors for `&diff` buffers - Inline merge conflict detection, highlighting, and resolution -- Email quoting/patch syntax support (`> diff ...`) -- Vim syntax fallback -- Configurable highlighiting blend & priorities -- Context-inclusive, high-accuracy highlights +- Email-quoted diff highlighting (`> diff ...` prefixes, arbitrary nesting + depth) +- Vim syntax fallback, configurable blend/priorities ## Requirements diff --git a/doc/diffs.nvim.txt b/doc/diffs.nvim.txt index 6798173..3bb5a09 100644 --- a/doc/diffs.nvim.txt +++ b/doc/diffs.nvim.txt @@ -89,7 +89,7 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads: max_lines = 500, }, vim = { - enabled = true, + enabled = false, max_lines = 200, }, intra = { @@ -204,7 +204,7 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads: See |diffs.TreesitterConfig| for fields. {vim} (table, default: see below) - Vim syntax fallback highlighting options. + Vim syntax highlighting options (experimental). See |diffs.VimConfig| for fields. {intra} (table, default: see below) @@ -269,15 +269,13 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads: *diffs.VimConfig* Vim config fields: ~ - {enabled} (boolean, default: true) + {enabled} (boolean, default: false) Use vim syntax highlighting as fallback when no treesitter parser is available for a language. Creates a scratch buffer, sets the filetype, and queries |synID()| per character to extract - highlight groups. Deferred via |vim.schedule()| - so it never blocks the first paint. Slower than - treesitter but covers languages without a TS - parser installed (e.g., COBOL, Fortran). + highlight groups. Slower than treesitter but + covers languages without a TS parser installed. {max_lines} (integer, default: 200) Skip vim syntax highlighting for hunks larger than diff --git a/lua/diffs/init.lua b/lua/diffs/init.lua index 0bfc373..d1cc7d2 100644 --- a/lua/diffs/init.lua +++ b/lua/diffs/init.lua @@ -124,7 +124,7 @@ local default_config = { max_lines = 500, }, vim = { - enabled = true, + enabled = false, max_lines = 200, }, intra = {