vim: add weechatlog syntax file

[shutils.git] / dotfiles / vim / .vimrc

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 739ae07cf327d4bcfbd6b53d23d2e39b0059a296..7016d05d3984e491f4e43d32f11ecc6b651ea513 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
 
@@ -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 
@@ -319,6 +320,9 @@ let g:SuperTabDefaultCompletionType = 'context'
 "let g:SuperTabDefaultCompletionType = '<c-x><c-u>'
 
 
-source ~/.vimrc-local
+
+if filereadable($HOME . "/.vimrc-local")
+       source ~/.vimrc-local
+endif