Skip to content

fix: cursorcolumn and cursorline in Fugitive diff #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xmready wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: cursorcolumn and cursorline in Fugitive diff #340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions colors/onedark.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,17 @@ call s:h("ColorColumn", { "bg": s:cursor_grey }) " used for the columns set with
call s:h("Conceal", {}) " placeholder characters substituted for concealed text (see 'conceallevel')
call s:h("Cursor", { "fg": s:black, "bg": s:blue }) " the character under the cursor
call s:h("CursorIM", {}) " like Cursor, but used when in IME mode
call s:h("CursorColumn", { "bg": s:cursor_grey }) " the screen column that the cursor is in when 'cursorcolumn' is set
if &diff
" Don't change the background color in diff mode
call s:h("CursorLine", { "gui": "underline" }) " the screen line that the cursor is in when 'cursorline' is set
else
call s:h("CursorLine", { "bg": s:cursor_grey }) " the screen line that the cursor is in when 'cursorline' is set
endif
function! s:update_cursor_highlighting()
if &diff
call s:h("CursorLine", { "gui": "underline", "cterm": "underline" }) " the screen line that the cursor is in when 'cursorline' is set
call s:h("CursorColumn", {}) " the screen line that the cursor is in when 'cursorcolumn' is set
else
call s:h("CursorLine", { "bg": s:cursor_grey }) " the screen line that the cursor is in when 'cursorline' is set
call s:h("CursorColumn", { "bg": s:cursor_grey }) " the screen line that the cursor is in when 'cursorcolumn' is set
endif
endfunction
call s:update_cursor_highlighting()
autocmd OptionSet diff call s:update_cursor_highlighting()
call s:h("Directory", { "fg": s:blue }) " directory names (and other special names in listings)
call s:h("DiffAdd", { "bg": s:green, "fg": s:black }) " diff mode: Added line
call s:h("DiffChange", { "fg": s:yellow, "gui": "underline", "cterm": "underline" }) " diff mode: Changed line
Expand Down