X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fvim%2F.vimrc;h=7016d05d3984e491f4e43d32f11ecc6b651ea513;hb=2825fa4a30ab3880209a9be74a2d70da27874357;hp=e65aba1f042acc8514c0aab09929fd5319d5fb77;hpb=c7e790b9b976ff4be6226a4baaaffe19c01e7aaa;p=shutils.git

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index e65aba1..7016d05 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
 
@@ -89,10 +92,11 @@ au Filetype fortran		set cindent cst csto=0
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  IRSSI logs
+"  IRC logs
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-au BufRead,BufNewFile */.irssi/logs/*.log    set filetype=irssilog
+au BufRead,BufNewFile */.irssi/logs/*.log  set filetype=irssilog
+au BufRead,BufNewFile *.weechatlog         set filetype=weechatlog
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -115,7 +119,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 +235,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