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

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 739ae07..5b16e00 100644
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -8,10 +8,15 @@
 "option and setting.
 
 
+set nocompatible
+
 " Pathogen runtime path manipulation
 "call pathogen#infect() "Using the infect method breaks ft detection
+filetype off
 call pathogen#runtime_append_all_bundles()
+call pathogen#helptags()
 
+set encoding=utf8
 
 "Activate syntax highlighting
 syntax on
@@ -26,7 +31,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 +68,11 @@ set listchars=tab:»­,trail:·,eol:$
 
 set autoindent
 set tabstop=4
-au Filetype python,tex,c,cpp,cs,objc,java :DetectIndent
+set shiftwidth=4
+if exists(":DetectIndent")
+	au BufReadPost * :DetectIndent
+endif
+"au Filetype python,tex,c,cpp,cs,objc,java :DetectIndent
 "let g:detectindent_preferred_expandtab = 1
 "let g:detectindent_preferred_indent = 4
 
@@ -74,33 +84,23 @@ let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : '', 'sp' : '' }
 colorscheme shuber-wombat
 
 set cursorline
+set laststatus=2
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  fortran
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-"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
+"  key bindings
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-au BufRead,BufNewFile */.irssi/logs/*.log    set filetype=irssilog
+map <A-c> <plug>NERDCommenterToggle
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  Easychair conference system review form
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  fortran
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-au BufRead,BufNewFile review_form_*.txt set filetype=easychair
-au Syntax easychair runtime! syntax/easychair.vim
+"let fortran_free_source=1
+au BufNewFile *.f90		set fortran_free_source=1
+au Filetype fortran		set cindent cst csto=0
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -115,7 +115,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 +231,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 +260,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
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -280,45 +275,21 @@ au Filetype xml map <M-o> :call OpenIn("ipe") <CR>
 "  gnuplot
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-
-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>
 
 
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  Commenting
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-let g:EnhCommentifyUseAltKeys = 'Yes'
-
-
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  Tab completion
+"  youcompleteme
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-"function InsertTabWrapper()
-"    let col = col('.') - 1
-"    if !col || getline('.')[col - 1] !~ '\k'
-"        return "\<tab>"
-"    else
-"        return "\<c-p>"
-"    endif
-"endfunction
+let g:ycm_min_num_of_chars_for_completion = 999
 
-" Remap the tab key to select action with InsertTabWrapper
-"inoremap <C-space> <c-r>=InsertTabWrapper()<cr>
 
-let g:SuperTabMappingForward = "<C-space>"
-let g:SuperTabDefaultCompletionType = 'context'
-"let g:SuperTabDefaultCompletionType = '<c-x><c-u>'
 
 
-source ~/.vimrc-local
+if filereadable($HOME . "/.vimrc-local")
+	source ~/.vimrc-local
+endif