From c81985c5198ceb0e0bb69aebf5aab78033145ccb Mon Sep 17 00:00:00 2001
From: Joshua Potter <jrpotter2112@gmail.com>
Date: Tue, 23 May 2017 21:35:51 -0700
Subject: [PATCH] ExpandRegister to ExpandReg and reformat.

---
 autoload/highlight.vim |  4 ++--
 plugin/hightlight.vim  | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/autoload/highlight.vim b/autoload/highlight.vim
index 7bbdd7e..34cb426 100644
--- a/autoload/highlight.vim
+++ b/autoload/highlight.vim
@@ -14,7 +14,7 @@
 " ------------------------------------------------------------------------------
 " The h_register currently active. This defaults to the unnamed register.
 
-let s:active_register = "\""
+let s:active_register = "1"
 
 
 " s:registry :: { String : { String : Match } } {{{2
@@ -37,7 +37,7 @@ let s:registry = {}
 " constantly prefix registration. This can be changed by setting the value of
 " g:persist_unnamed_register to 1.
 
-function! highlight#expand_register(reg)
+function! highlight#expand_reg(reg)
   if !g:persist_unnamed_register && a:reg ==# '"'
     return s:active_register
   endif
diff --git a/plugin/hightlight.vim b/plugin/hightlight.vim
index a1b04c7..c35151e 100644
--- a/plugin/hightlight.vim
+++ b/plugin/hightlight.vim
@@ -60,27 +60,32 @@ endif
 
 " Append Searches
 noremap <Plug>HRegistry_AppendToSearch
-    \ :call highlight#append_to_search(highlight#expand_register(v:register), highlight#expand_flag('c'))<Bar>
-    \  call highlight#count_pattern(highlight#expand_flag('c'))<CR>
+    \ :call highlight#append_to_search(highlight#expand_reg(v:register),
+    \                                  highlight#expand_flag('c'))
+    \ <Bar>call highlight#count_pattern(highlight#expand_flag('c'))<CR>
 noremap <Plug>HRegistry_GAppendToSearch
-    \ :call highlight#append_to_search(highlight#expand_register(v:register), highlight#expand_flag('g'))<Bar>
-    \  call highlight#count_pattern(highlight#expand_flag('g'))<CR>
+    \ :call highlight#append_to_search(highlight#expand_reg(v:register),
+    \                                  highlight#expand_flag('g'))
+    \ <Bar>call highlight#count_pattern(highlight#expand_flag('g'))<CR>
 noremap <Plug>HRegistry_VisualAppendToSearch
-    \ :call highlight#append_to_search(highlight#expand_register(v:register), highlight#expand_flag('v'))<Bar>
-    \  call highlight#count_pattern(highlight#expand_flag('v'))<CR>
+    \ :call highlight#append_to_search(highlight#expand_reg(v:register),
+    \                                  highlight#expand_flag('v'))
+    \ <Bar>call highlight#count_pattern(highlight#expand_flag('v'))<CR>
 
 " Remove Searches
 noremap <Plug>HRegistry_RemoveFromSearch
-    \ :call highlight#remove_from_search(highlight#expand_register(v:register), highlight#expand_flag('c'))<CR>
+    \ :call highlight#remove_from_search(highlight#expand_reg(v:register),
+    \                                    highlight#expand_flag('c'))<CR>
 noremap <Plug>HRegistry_VisualRemoveFromSearch
-    \ :call highlight#remove_from_search(highlight#expand_register(v:register), highlight#expand_flag('v'))<CR>
+    \ :call highlight#remove_from_search(highlight#expand_reg(v:register),
+    \                                    highlight#expand_flag('v'))<CR>
 
 " Other Modifications
 noremap <Plug>HRegistry_ClearRegister
-    \ :call highlight#clear_register(highlight#expand_register(v:register))<Bar>
-    \  call highlight#activate_register(highlight#expand_register(v:register))<CR>
+    \ :call highlight#clear_register(highlight#expand_reg(v:register))<Bar>
+    \  call highlight#activate_register(highlight#expand_reg(v:register))<CR>
 noremap <Plug>HRegistry_ActivateRegister
-    \ :call highlight#activate_register(highlight#expand_register(v:register))<CR>
+    \ :call highlight#activate_register(highlight#expand_reg(v:register))<CR>
 noremap <Plug>HRegistry_CountLastSeen
     \ :call highlight#count_pattern(highlight#expand_flag('c'))<CR>