From: Stefan Huber <shuber@sthu.org>
Date: Wed, 1 Apr 2015 08:30:42 +0000 (+0200)
Subject: dotfiles vim: update
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=7475051f66d41ab4f726866bb33c89baa1ecb506;p=shutils.git

dotfiles vim: update
---

diff --git a/dotfiles/vim/.gvimrc b/dotfiles/vim/.gvimrc
index 8bbfa5e..a7080f8 100644
--- a/dotfiles/vim/.gvimrc
+++ b/dotfiles/vim/.gvimrc
@@ -7,10 +7,11 @@ endif
 
 
 set lines=25
-set columns=88
+set columns=90
 
 set cursorline
 set mousehide
+"set guioptions-=T
 
 
 function SetPresentationFont(mode)
@@ -24,7 +25,7 @@ endfunction
 :menu Presentation.On	:call SetPresentationFont(1)<CR>
 :menu Presentation.Off	:call SetPresentationFont(0)<CR>
 
-call SetPresentationFont(0)
+"call SetPresentationFont(0)
 
 
 
diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 3858f3a..62ca06d 100644
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -56,7 +56,7 @@ set mouse=a
 
 " Use 256 colors
 set t_Co=256
-let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : '', 'sp' : '' }
+let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : 'underline', 'sp' : 'bg' }
 colorscheme shuber-wombat
 
 
@@ -103,6 +103,9 @@ endfunction
 "  key bindings
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+nmap <s-PageDown> :bn<CR>
+nmap <s-PageUp>   :bp<CR>
+
 map <a-c> <plug>NERDCommenterToggle
 nmap <F9> :NERDTreeToggle<CR>
 nmap <F10> :TagbarToggle<CR>
@@ -133,7 +136,7 @@ au Filetype c,cpp,cs,objc,java map <S-F11> :A <CR>
 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,objc set makeprg=make
 
 
 "Prepend the namespace to an identifier, e.g. 'std::' before 'map' excluding
@@ -208,6 +211,7 @@ autocmd BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 au Filetype text set textwidth=80
+au Filetype markddown set textwidth=80
 "According to thunderbirds settings
 au Filetype mail set textwidth=72
 au Filetype mail set expandtab
@@ -247,8 +251,31 @@ au BufRead,BufNewFile *.wxm set filetype=maxima
 "  LaTeX
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+
+let g:LatexBox_split_side = "rightbelow"
+"let g:LatexBox_split_resize = 1
+let g:LatexBox_ref_pattern = '\c\\\a*ref\*\?\_\s*{'
+
+let g:tex_flavor = "latex"
+let g:LatexBox_output_type = "pdf"
+let g:LatexBox_viewer = "okular"
+let g:LatexBox_latexmk_async = 1
+let g:LatexBox_latexmk_preview_continuously = 1
+"let g:LatexBox_show_warnings = 0
+let g:LatexBox_quickfix = 4
+
+
+if version >= 700
+    au Filetype tex set spell
+endif
+
 au BufRead,BufNewFile *.cls set filetype=tex
 au Filetype tex set textwidth=80
+au Filetype tex set smartindent
+" Override Tagbar Toggle with LatexBox TOC
+au Filetype tex nmap <F10> :LatexTOCToggle<CR>
+au Filetype tex nmap <F11> :LatexLabels<CR>
+
 
 "Remove Umlaute
 function TexTransUmlaute()
@@ -268,20 +295,6 @@ function FindWordRepeatings()
 "        call cursor(pos)
 endfunction
 
-let g:tex_flavor = "latex"
-let g:LatexBox_output_type = "pdf"
-let g:LatexBox_viewer = "okular"
-let g:LatexBox_latexmk_async = 1
-let g:LatexBox_latexmk_preview_continuously = 1
-let g:LatexBox_show_warnings = 0
-let g:LatexBox_quickfix = 2
-
-au Filetype tex set smartindent
-
-if version >= 700
-    au Filetype tex set spell
-endif
-
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  python
@@ -323,18 +336,29 @@ au Filetype gnuplot map <M-o> :call OpenIn("gnuplot -persist") <CR>
 au BufRead,BufNewFile */.remind/* set filetype=remind
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  closetag
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:unaryTagsStack = ""
+au Filetype html,xml,xsl source /usr/share/vim/vimfiles/plugin/closetag.vim
+
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  youcompleteme
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-"let g:ycm_path_to_python_interpreter = '/usr/bin/python'
-let g:ycm_global_ycm_extra_conf = '/home/shuber/.ycm_extra_conf.py'
-let g:ycm_min_num_of_chars_for_completion = 999
-let g:ycm_key_list_select_completion = ['<Down>']
+let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+
+let g:ycm_min_num_of_chars_for_completion = 4
 let g:ycm_collect_identifiers_from_tags_files = 1
 let g:ycm_autoclose_preview_window_after_completion = 1
+
+let g:ycm_key_list_select_completion = ['<Down>']
 nnoremap <leader>jd :YcmCompleter GoToDefinitionElseDeclaration<CR>
 
+let g:ycm_filetype_whitelist = { 'c' : 1, 'cpp' : 1, 'cs' : 1, 'objc' : 1, 'java' : 1, 'python' : 1 }
+
 "let g:ycm_server_use_vim_stdout = 1
 "let g:ycm_server_log_level = 'debug'