3 files changed, 18 insertions, 7 deletions

diff --git a/vim/init/basic.vim b/vim/init/basic.vim
index 37e0abf..79ed3fd 100644
--- a/vim/init/basic.vim
+++ b/vim/init/basic.vim
@@ -101,7 +101,10 @@ set matchtime=2
 set statusline=\ %F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c
 set laststatus=2            " Always show the status line
 set ruler                    " Show cursor position
-set wildmenu wildoptions=pum,fuzzy
+set wildmenu
+if has('nvim')
+  set wildoptions=pum,fuzzy
+endif
 
 " Format of error message
 set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
@@ -110,7 +113,11 @@ set errorformat+=[%f:%l]\ ->\ %m,[%f:%l]:%m
 set splitright
 
 " Set signcolumn
-set signcolumn=yes:3
+if has('nvim')
+  set signcolumn=yes:3
+else
+  set signcolumn=3
+endif
 " Custom sign from help page :h sign
 sign define piet text=>> texthl=Search
 
diff --git a/vim/init/highlight.vim b/vim/init/highlight.vim
index 22fe5a3..01f74b8 100644
--- a/vim/init/highlight.vim
+++ b/vim/init/highlight.vim
@@ -2,7 +2,9 @@
 hi LuaParen ctermfg=NONE ctermbg=darkgrey cterm=NONE
 
 " Show trailing spaces
-match ExtraWhitespace /\s\+$/
+if has('nvim')
+  match ExtraWhitespace /\s\+$/
+endif
 hi ExtraWhitespace ctermbg=red guibg=red
 
 hi CursorLine guibg=NONE
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index bf3d7ab..2d58fe9 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -46,10 +46,12 @@ nnoremap q: :
 " WORKING_DIR {{{
 
 let g:last_path = execute("pwd")
-augroup SaveLatestDir
-  au!
-  autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0]
-augroup END
+if has('nvim')
+  augroup SaveLatestDir
+    au!
+    autocmd DirChangedPre * let g:last_path = split(execute('pwd'), "\n")[0]
+  augroup END
+endif
 
 " Switch CWD to the directory of the open buffer
 nnoremap cd :cd %:p:h<CR>:pwd<CR>