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

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 7c4d049..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
@@ -64,7 +69,9 @@ set listchars=tab:»­,trail:·,eol:$
 set autoindent
 set tabstop=4
 set shiftwidth=4
-au Filetype * :DetectIndent
+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
@@ -77,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
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -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,43 +275,16 @@ 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
+"  youcompleteme
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-let g:EnhCommentifyUseAltKeys = 'Yes'
-
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  Tab completion
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:ycm_min_num_of_chars_for_completion = 999
 
-"function InsertTabWrapper()
-"    let col = col('.') - 1
-"    if !col || getline('.')[col - 1] !~ '\k'
-"        return "\<tab>"
-"    else
-"        return "\<c-p>"
-"    endif
-"endfunction
-
-" 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>'