X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fvim%2F.vimrc;h=7c4d049abaa82c181a0149509c4e750eb539cf07;hb=f111c9362e6680ed06ea96c1874baca9621c9ded;hp=54f8399206dde4032abbd029163835e246a12d2b;hpb=d8c81b29f9e77242b24ec42da7f88c4a696dba17;p=shutils.git

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 54f8399..7c4d049 100644
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -8,24 +8,26 @@
 "option and setting.
 
 
+" Pathogen runtime path manipulation
+"call pathogen#infect() "Using the infect method breaks ft detection
+call pathogen#runtime_append_all_bundles()
+
 
+"Activate syntax highlighting
+syntax on
 "Activate filetype plugins: syntax highlighting, indentation, and more
-filetype plugin on
-filetype indent on
-filetype on
+filetype plugin indent on
 
 set modeline
-
-set autoindent
-"set tabstop=4
 set number
-set bs=2
+set backspace=indent,eol,start
 
 "vim-7 and newer has vimspell (spell checker) built in
 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
@@ -39,9 +41,6 @@ set incsearch
 set hlsearch
 
 
-"Activate syntax highlighting
-syntax on
-
 "Power saving tip: powertop-homepage
 let &guicursor = &guicursor . ",a:blinkon0"
 "According to vim help -- enable mouse in xterm...
@@ -59,12 +58,25 @@ highlight BadWhitespace ctermbg=red guibg=red
 " Make trailing whitespace be flagged as bad.
 au Filetype python,tex,c,cpp,cs,objc,java syn match BadWhitespace /\s\+$/ containedin=ALL
 
-" set list to activate 
 set listchars=tab:»­,trail:·,eol:$
 
 
-" Pathogen runtime path manipulation
-call pathogen#infect()
+set autoindent
+set tabstop=4
+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
+
+
+
+" Use 256 colors
+set t_Co=256
+let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : '', 'sp' : '' }
+colorscheme shuber-wombat
+
+set cursorline
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -106,8 +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 tabstop=4
-au Filetype c,cpp,cs,obj set shiftwidth=4
 
 
 "Adds STL prefix 'std::' to 'id'
@@ -170,6 +180,10 @@ if version>=700
 	au Filetype mail,text set fo+=n spell
 endif
 
+"Scissor line
+au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
+au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
+
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -220,9 +234,6 @@ let g:LatexBox_latexmk_options="-pvc"
 
 au Filetype tex set smartindent
 
-au Filetype tex set tabstop=4
-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 
@@ -248,7 +259,6 @@ au Filetype python map <F5> :!python % <CR>
 
 " Number of spaces that a pre-existing tab is equal to.
 " For the amount of space used for a new tab use shiftwidth.
-au Filetype python set tabstop=4
 au Filetype python set shiftwidth=4
 au Filetype python set expandtab
 
@@ -309,6 +319,9 @@ let g:SuperTabDefaultCompletionType = 'context'
 "let g:SuperTabDefaultCompletionType = '<c-x><c-u>'
 
 
-source ~/.vimrc-local
+
+if filereadable($HOME . "/.vimrc-local")
+	source ~/.vimrc-local
+endif