X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fvim%2F.vimrc;h=555238542fcc4ea6b003f0d47cfc0c5068e4fb7e;hb=b18acf8193b93a4b1bae35708a628c6acc686e85;hp=739ae07cf327d4bcfbd6b53d23d2e39b0059a296;hpb=e24bd8b17586664e83ea84ea35ea8a05a486d6a8;p=shutils.git

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 739ae07..5552385 100644
--- 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
 
@@ -82,27 +85,9 @@ set cursorline
 
 "let fortran_free_source=1
 au BufNewFile *.f90		set fortran_free_source=1
-au BufRead,BufNewFile *.INC	set filetype=fortran
 au Filetype fortran		set cindent cst csto=0
 
 
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  IRSSI logs
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-au BufRead,BufNewFile */.irssi/logs/*.log    set filetype=irssilog
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  Easychair conference system review form
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-au BufRead,BufNewFile review_form_*.txt set filetype=easychair
-au Syntax easychair runtime! syntax/easychair.vim
-
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  C, C++, C#, objc, java
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -115,7 +100,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 +216,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 
@@ -263,9 +245,7 @@ au Filetype python set shiftwidth=4
 au Filetype python set expandtab
 
 " Wrap text after a certain number of characters
-au BufRead,BufNewFile *.py,*.pyw set textwidth=79
-
-
+au Filetype python set textwidth=79
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -281,10 +261,6 @@ au Filetype xml map <M-o> :call OpenIn("ipe") <CR>
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 
-au BufRead,BufNewFile *.plt    	  set filetype=gnuplot
-au BufRead,BufNewFile *.plot      set filetype=gnuplot
-au BufRead,BufNewFile *.gnuplot   set filetype=gnuplot
-
 "Opens the current file in ipe
 au Filetype gnuplot map <M-o> :call OpenIn("gnuplot -persist") <CR>
 
@@ -319,6 +295,9 @@ let g:SuperTabDefaultCompletionType = 'context'
 "let g:SuperTabDefaultCompletionType = '<c-x><c-u>'
 
 
-source ~/.vimrc-local
+
+if filereadable($HOME . "/.vimrc-local")
+	source ~/.vimrc-local
+endif