From 802d388c9dcc1c75b0acd8bcfe75cbd66c76838d Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sat, 26 Sep 2020 13:50:44 +0200
Subject: Trying to fix omap (WIP)

gG omap works characterwise but should work linewise.
Adding V to the gG omap causes >17G to indent 17 times instead of once.

Try changing `G` to an `<expr>` mapping to simplify the code, allowing
it to work more exactly like the normal `G`. This resulted in moving the
logic to `grappele#Recall()`, causing problems for `gG`.
---
 plugin/grappele.vim | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugin')

diff --git a/plugin/grappele.vim b/plugin/grappele.vim
index 9ab1400..e04c8e4 100644
--- a/plugin/grappele.vim
+++ b/plugin/grappele.vim
@@ -4,22 +4,22 @@ endif
 let g:loaded_grappele = 1
 
 
-nnoremap <silent> <Plug>Grappele :<c-u>call grappele#Grappele(v:count, 'n')<cr>
-nnoremap <silent> <Plug>GrappeleRecall :<c-u>call grappele#Recall('n')<cr>
-vnoremap <silent> <Plug>GrappeleRecall :<c-u>call grappele#Recall('v')<cr>
-onoremap <silent> <Plug>GrappeleRecall :<c-u>call grappele#Recall('o')<cr>
+nnoremap <silent> <Plug>Grappele grappele#Grappele(v:count, 'n')
+nnoremap <silent> <Plug>GrappeleRecall :<C-u>call grappele#Recall('n')<cr>
+vnoremap <silent> <Plug>GrappeleRecall :<C-u>call grappele#Recall('v')<cr>
+onoremap <silent> <Plug>GrappeleRecall :<C-u>call grappele#Recall('o')<cr>
 
 if !hasmapto('<Plug>Grappele') || !maparg('G', 'n')
-	nnoremap <silent> G :<c-u>call grappele#Grappele(v:count, 'n')<cr>
+	nnoremap <silent> <expr> G grappele#Grappele(v:count, 'n')
 endif
 
 if !hasmapto('<Plug>Grappele') || !maparg('G', 'v')
-	vnoremap <silent> G
-		\ :<c-u>call grappele#Grappele(v:count, 'v', visualmode())<cr>
+	vnoremap <silent> <expr> G
+		\ grappele#Grappele(v:count, 'v', visualmode())
 endif
 
 if !hasmapto('<Plug>Grappele') || !maparg('G', 'o')
-	onoremap <silent> G :<c-u>call grappele#Grappele(v:count, 'o')<cr>
+	onoremap <silent> <expr> G grappele#Grappele(v:count, 'o')
 endif
 
 if !hasmapto('<Plug>GrappeleRecall') || !maparg('gG', 'n')
-- 
cgit v1.2.3