From 432d4768db4ec70cd0d3ed7e22c324f7be379375 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Tue, 5 Mar 2024 15:53:12 -0500 Subject: [PATCH] Create new mappings for signify jumps so they don't conflict with treesitter textobjects mappings --- vim/config/keyboard.vim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index c69bc8e..2ec216b 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -166,6 +166,8 @@ " | (N) -> vim-move: move a line up one line " | (N) -> vim-move: move a line down one line " +" ]g | (N) -> next difference (vimdiff/signify) +" [g | (N) -> previous difference (vimdiff/signify) " >> | (N) -> next difference (vimdiff/signify) " << | (N) -> previous difference (vimdiff/signify) " @@ -577,13 +579,11 @@ nmap MoveLineUp nmap MoveLineDown - "map signify to ]c and [c - let g:signify_mapping_next_hunk = ']c' - let g:signify_mapping_prev_hunk = '[c' - "move to next/previous difference (vimdiff/signify) - nmap >> ]c - nmap << [c + nmap ]g (signify-next-hunk) + nmap [g (signify-prev-hunk) + nmap >> ]g + nmap << [g "} "SELECTION:{