vim: updates

diff --git a/dotfiles/vim/.vim/colors/shuber-wombat.vim b/dotfiles/vim/.vim/colors/shuber-wombat.vim
index a1c40a3d5717f088307af77e8e19ed1cbabe0183..5ffde253b40acf131de674e84f9304a12b18b768 100644 (file)
--- a/dotfiles/vim/.vim/colors/shuber-wombat.vim
+++ b/dotfiles/vim/.vim/colors/shuber-wombat.vim
@@ -16,7 +16,7 @@ let colors_name = "shuber-wombat"
 if version >= 700
   hi CursorLine     guibg=#2d2d2d
   hi CursorColumn   guibg=#2d2d2d
-  hi ColorColumn    guibg=#2d2d2d
+  hi ColorColumn    guibg=#151515
   hi MatchParen     guifg=#f6f3e8 guibg=#857b6f gui=bold
   hi Pmenu          guifg=#f6f3e8 guibg=#444444
   hi PmenuSel       guifg=#000000 guibg=#cae682
@@ -28,7 +28,8 @@ hi Cursor           guifg=NONE    guibg=#656565 gui=none
 hi Normal           guifg=white guibg=#202020 gui=none
 hi NonText          guifg=#808080 guibg=#303030 gui=none
 hi LineNr           guifg=#857b6f guibg=#000000 gui=none
-hi StatusLine       guifg=#f6f3e8 guibg=#444444 gui=italic
+hi Search           guifg=#404040 guibg=Yellow
+hi StatusLine       guifg=#f6f3e8 guibg=#666666 gui=italic
 hi StatusLineNC     guifg=#857b6f guibg=#444444 gui=none
 hi VertSplit        guifg=#444444 guibg=#444444 gui=none
 hi Folded           guibg=#384048 guifg=#a0a8b0 gui=none
@@ -61,3 +62,5 @@ hi mailQuoted6      guifg=#8f8f8f gui=italic
 hi BadWhitespace    guibg=red
 hi diffAdded        guifg=green
 hi diffRemoved      guifg=red
+hi diffText         guifg=violet
+hi diffChanged      guifg=pink

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index e65aba1f042acc8514c0aab09929fd5319d5fb77..7c4d049abaa82c181a0149509c4e750eb539cf07 100644 (file)
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -26,7 +26,8 @@ set backspace=indent,eol,start
 if version >= 703
        set spelllang=de_at,en
        set tabpagemax=20
-       set colorcolumn=80,+1
+       "set colorcolumn=80,+1
+       set colorcolumn=+1
 endif
 
 "Set some properties for ctags, grep and the size of the
@@ -62,7 +63,9 @@ set listchars=tab:»­,trail:·,eol:$
 
 set autoindent
 set tabstop=4
-au Filetype python,tex,c,cpp,cs,objc,java :DetectIndent
+set shiftwidth=4
+au Filetype * :DetectIndent
+"au Filetype python,tex,c,cpp,cs,objc,java :DetectIndent
 "let g:detectindent_preferred_expandtab = 1
 "let g:detectindent_preferred_indent = 4
 
@@ -115,7 +118,6 @@ au Filetype c,cpp,cs,objc,java set cindent cst csto=0
 au Filetype c,cpp,cs,objc map <F7> :make <CR>
 au Filetype java map <F7> :!ant -f ../build.xml <CR>
 au Filetype c,cpp,cs,obj set makeprg=make
-au Filetype c,cpp,cs,obj set shiftwidth=4
 
 
 "Adds STL prefix 'std::' to 'id'
@@ -232,8 +234,6 @@ let g:LatexBox_latexmk_options="-pvc"
 
 au Filetype tex set smartindent
 
-au Filetype tex set shiftwidth=4
-
 au Filetype tex map! ,b \begin{}<Esc>i
 au Filetype tex map! ,e <esc>:call TexClosePrev(0)<cr>a<cr>
 au Filetype tex map! ,i \begin{itemize}<Return>\end{itemize}<ESC>O\item