nojhan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(kakrc): missed merged

Browse source
This commit is contained in:
Johann Dreo 2024-09-21 10:40:47 +02:00
commit f0377bef47
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
kak/kakrc
View file

@ -327,7 +327,6 @@ plug "dmerejkowsky/kak-spell" config %{
map global user g '/[<lt><gt>=]{7}<ret>vv' -docstring 'Search for Git conflict markers' map global user g '/[<lt><gt>=]{7}<ret>vv' -docstring 'Search for Git conflict markers'
<<<<<<< HEAD
set-option -add global ui_options ncurses_padding_char=╱ # Examples: ▚ ╳ ╱ ┼ ╲ set-option -add global ui_options ncurses_padding_char=╱ # Examples: ▚ ╳ ╱ ┼ ╲
# add-highlighter global/ scrollbar # add-highlighter global/ scrollbar
@ -335,16 +334,6 @@ set-option -add global ui_options ncurses_padding_char=╱ # Examples: ▚ ╳
# add-highlighter global/scrollbar/ scrollbar-indicator yellow,default lint_flags # add-highlighter global/scrollbar/ scrollbar-indicator yellow,default lint_flags
# # add-highlighter global/scrollbar/ scrollbar-indicator red,default git_diff_flags # # add-highlighter global/scrollbar/ scrollbar-indicator red,default git_diff_flags
# # git show-diff # # git show-diff
=======
#set-option -add global ui_options ncurses_padding_char=╱ # Examples: ▚ ╳ ╱ ┼ ╲
set-option -add global ui_options ncurses_padding_char=/ # Examples: ▚ ╳ ╱ ┼ ╲
add-highlighter global/ scrollbar
add-highlighter global/scrollbar/ scrollbar-indicator red,default lsp_error_lines
add-highlighter global/scrollbar/ scrollbar-indicator yellow,default lint_flags
# add-highlighter global/scrollbar/ scrollbar-indicator red,default git_diff_flags
# git show-diff
>>>>>>> eb1e2f43fd3a3995350a6bd207f2884271c5aa4a
# Force `liquidprompt` to be a shell filetype. # Force `liquidprompt` to be a shell filetype.