Merge branch 'master' into release

1 files changed, 8 insertions, 6 deletions

diff --git a/tools/conf/etc/skel/.vimrc b/tools/conf/etc/skel/.vimrc
index 0a3656d..fb4445f 100644
--- a/tools/conf/etc/skel/.vimrc
+++ b/tools/conf/etc/skel/.vimrc
@@ -34,12 +34,16 @@ set incsearch		" do incremental searching
 "
 "" Switch syntax highlighting on, when the terminal has colors
 "" Also switch on highlighting the last used search pattern.
+
+" colorscheme desert
+set t_Co=256
 if &t_Co > 2 || has("gui_running")
   syntax on
   set hlsearch
   set background=dark
   colorscheme wombat256mod
   " colorscheme desert
+  :hi SpellBad ctermfg=Black guifg=Black
 endif
 
 
@@ -110,12 +114,10 @@ map <F3> :tabprevious<CR>
 map <F4> :tabnext<CR>
 "
 "" Show Line Numbers
-"" set nu
-"" Show Relative Line Numbers
 set relativenumber
-"set complete=.,b,u,]
-"set wildmode=longest,list:longest
-"set completeopt=menu,preview
+set complete=.,b,u,]
+set wildmode=longest,list:longest
+set completeopt=menu,preview
 "
 "" Directories
 set backupdir=~/.vim/backup
@@ -147,7 +149,7 @@ autocmd BufWinLeave * call clearmatches()
 "" Finally, if you want an indent to correspond to a single tab, you should also use:
 ""set shiftwidth=4
 "" For indents that consist of 4 space characters but are entered with the tab key:
-set tabstop=4 softtabstop=0 expandtab shiftwidth=4 smarttab
+set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab
 "set list
 "" set past gives problems with tabs
 "" set paste