Merge remote-tracking branch 'gitea/master'

vim/vimrc

@@ -132,13 +132,13 @@ endif
 "
 "   Configure color theme, fonts and other graphics.
 "
-if has('gui_running')
+if &t_Co > 16
     " set color scheme
     colorscheme darkblue
     "set guioptions-=m
     "set guioptions-=T
-    set lines=50
-    set columns=85
+    "set lines=50
+    "set columns=85
 
     " Set the font.
     if has("win32") || has("win64")
@@ -148,8 +148,6 @@ if has('gui_running')
         "set guifont=Bitstream\ Vera\ Sans\ Mono\ 12
         set guifont=Monospace\ 12
     endif
-else
-    colorscheme vahagn_black_terminal
 endif
 
 " Switch syntax highlighting on, when the terminal has colors