From 8301d70c31ace1569485977eacde75a7ec1e1c3f Mon Sep 17 00:00:00 2001
From: ray <gitea@rayelliott.dev>
Date: Sat, 1 Aug 2020 12:08:43 +0100
Subject: [PATCH] fixes/improvements

---
 init.auto-window.vim | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/init.auto-window.vim b/init.auto-window.vim
index 1d7c3a2..c587477 100644
--- a/init.auto-window.vim
+++ b/init.auto-window.vim
@@ -1,26 +1,33 @@
 "auto_window_settings {{{
-function! WinEnterColorColumn() abort"{{{
+function! OnWinEnter() abort"{{{
   if &buftype != ''
     setlocal colorcolumn=0
   elseif exists('b:colorcolumn_restore')
     execute 'setlocal colorcolumn=' . b:colorcolumn_restore
   endif
+  if &buftype == 'terminal'
+	  setlocal nonumber norelativenumber
+  else
+	  setlocal number relativenumber
+  endif
+  setlocal cursorline
+  setlocal cursorcolumn
 endfunction
 
 "}}}
-function! WinLeaveColorColumn() abort"{{{
+function! OnWinLeave() abort"{{{
   let b:colorcolumn_restore = &colorcolumn
   setlocal colorcolumn=0
+  setlocal nocursorline
+  setlocal nocursorcolumn
+  setlocal norelativenumber
 endfunction
 
 "}}}
 augroup auto_window_settings "{{{
   autocmd!
-  autocmd WinEnter * call WinEnterColorColumn()
-  autocmd WinEnter * set cursorline | set cursorcolumn
-  " autocmd WinLeave * setlocal colorcolumn=0
-  autocmd WinLeave * call WinLeaveColorColumn()
-  autocmd WinLeave * set nocursorline | set nocursorcolumn
+  autocmd WinEnter * call OnWinEnter()
+  autocmd WinLeave * call OnWinLeave()
 augroup END
 "}}} augroup auto_window_settings
 "  }}} auto_window_settings