From e420a5b0297eabe50c194b58dea6e88b678bc1f5 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <k.benzie83@gmail.com>
Date: Wed, 3 May 2017 23:52:33 +0100
Subject: [PATCH] Update mappings to {i,n,v}noremap

---
 plugin/functions.vim | 10 ++++++++++
 plugin/mappings.vim  | 27 ++++++++++-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/plugin/functions.vim b/plugin/functions.vim
index c7fec97..dfe4eb9 100644
--- a/plugin/functions.vim
+++ b/plugin/functions.vim
@@ -114,3 +114,13 @@ function! <SID>CheckboxToggle()
 endfunction
 command! CheckboxToggle :call <SID>CheckboxToggle()
 nnoremap <leader><CR> :CheckboxToggle<CR>
+
+" Show highlight groups under the cursor
+function! s:CursorHighlightGroups()
+  let l:hi = synIDattr(synID(line('.'),col('.'),1),'name')
+  let l:trans = synIDattr(synID(line('.'),col('.'),0),'name')
+  let l:lo = synIDattr(synIDtrans(synID(line('.'),col('.'),1)),'name')
+  echo 'hi<'.l:hi.'> trans<'.l:trans.'> lo<'.l:lo.'>'
+endfunction
+command! CursorHighlightGroups :call s:CursorHighlightGroups()
+nnoremap <leader>hi :CursorHighlightGroups<CR>
diff --git a/plugin/mappings.vim b/plugin/mappings.vim
index 5c0e66e..11c5812 100644
--- a/plugin/mappings.vim
+++ b/plugin/mappings.vim
@@ -60,29 +60,22 @@ nnoremap <leader>to :tabonly<CR>
 nnoremap <leader>tm :tabmove<Space>
 
 " Clear search highlights
-map <leader><Space> :noh<CR>
-
-" Show highlight group under cursor
-map <leader>hi :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") .
-  \ '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
-  \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
+nnoremap <leader><Space> :nohlsearch<CR>
 
 " System clipboard yank/put
-map <leader>y "+y
-map <leader>Y "+Y
-map <leader>p "+p
-map <leader>P "+P
+noremap <leader>y "+y
+noremap <leader>Y "+Y
+noremap <leader>p "+p
+noremap <leader>P "+P
 
 " Quickly access spelling menu
-imap <C-s> <C-g>u<C-X>s
-nmap <C-s> i<C-g>u<C-X>s
+inoremap <C-s> <C-g>u<C-X>s
+nnoremap <C-s> i<C-g>u<C-X>s
 
 " Disable 'Q' from opening Ex mode
-nmap Q <nop>
-" Disable 'K' from loading man pages in normal mode
-nmap K <nop>
-" Disable 'K' from loading man pages in visual mode
-vmap K <nop>
+nnoremap Q <nop>
+" Disable 'K' from loading man pages
+noremap K <nop>
 
 " Split line at the cursor
 nnoremap [j i<CR><Esc>