More vim updates

vimrc

@@ -3,6 +3,7 @@ set autowrite
 set backspace=2
 set breakindent
 set clipboard=unnamed
+set cmdheight=2
 set colorcolumn=+1
 set complete+=kspell
 set cursorline
@@ -11,6 +12,7 @@ set encoding=utf-8
 set expandtab
 set exrc
 set fillchars=vert:▐
+set hidden
 set history=50
 set incsearch
 set laststatus=2
@@ -27,6 +29,7 @@ set numberwidth=5
 set ruler
 set shiftround
 set shiftwidth=2
+set shortmess+=c
 set showbreak=··
 set showcmd
 set signcolumn=yes
@@ -38,8 +41,14 @@ set termguicolors
 set textwidth=80
 set title
 set ttyfast
+set updatetime=300
 set vb t_vb=
 
+if has("nvim-0.5.0") || has("patch-8.1.1564")
+  " Recently vim can merge signcolumn and number column into one
+  set signcolumn=number
+endif
+
 syntax enable
 syntax sync minlines=128 maxlines=512
 
@@ -95,11 +104,6 @@ if filereadable(expand("~/.config/nvim/test"))
   source ~/.config/nvim/test
 endif
 
-" Golang setup
-if filereadable(expand("~/.config/nvim/golang"))
-  source ~/.config/nvim/golang
-endif
-
 " Color setup
 if filereadable(expand("~/.config/nvim/colors"))
   source ~/.config/nvim/colors