diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-07-30 23:05:15 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-07-30 23:05:15 +0200 |
| commit | 72c09c712bf490d3dcd5f2497bd5d8a3afb011a6 (patch) | |
| tree | 51edf6cc925e1594cb5a2aa32f390bd3da20f1f9 | |
| parent | 5b91a5c6ee28d1a4bd55df669c7be1d9455cf062 (diff) | |
| parent | 45ab21f4f6a2fde2076ed0cb37c702528287ac97 (diff) | |
| download | vimrc-72c09c712bf490d3dcd5f2497bd5d8a3afb011a6.tar.gz vimrc-72c09c712bf490d3dcd5f2497bd5d8a3afb011a6.tar.bz2 vimrc-72c09c712bf490d3dcd5f2497bd5d8a3afb011a6.zip | |
Merge with origin
| -rw-r--r-- | colors/bramwombat.vim | 15 | ||||
| -rw-r--r-- | dotvimrc | 24 |
2 files changed, 26 insertions, 13 deletions
diff --git a/colors/bramwombat.vim b/colors/bramwombat.vim index 3d56975..a5882a9 100644 --- a/colors/bramwombat.vim +++ b/colors/bramwombat.vim @@ -1,5 +1,5 @@ -" Maintainer: Matthias P. Braendli -" Last Change: Tue Jul 27 13:54:09 CEST 2010 +" Maintainer: Matthias P. Braendli +" Last Change: Wed 7 Jan 10:32:28 CET 2015 set background=dark @@ -13,11 +13,12 @@ let colors_name = "bramwombat" " Vim >= 7.0 specific colors if version >= 700 - hi CursorLine guibg=#2d2d2d - hi CursorColumn guibg=#2d2d2d - hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold - hi Pmenu guifg=#f6f3e8 guibg=#444444 - hi PmenuSel guifg=#000000 guibg=#cae682 + hi CursorLine guibg=#2d2d2d + hi CursorLineNr guifg=#958b7f guibg=#000000 gui=bold + hi CursorColumn guibg=#2d2d2d + hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold + hi Pmenu guifg=#f6f3e8 guibg=#444444 + hi PmenuSel guifg=#000000 guibg=#cae682 endif " General colors @@ -1,9 +1,9 @@ +set nocompatible syn on set ignorecase set smartcase set modeline set modelines=5 -set nocompatible set wildmode=longest:full set wildmenu set hlsearch @@ -19,6 +19,10 @@ set path=$PWD/** set showcmd set scrolloff=3 +" persistent-undo +set undodir=~/.vim/undodir +set undofile + set runtimepath+=~/.vim/bundle/neobundle.vim/ " remove toolbar @@ -68,6 +72,8 @@ NeoBundle 'git-time-lapse' NeoBundle 'Valloric/YouCompleteMe.git' let g:ycm_extra_conf_globlist = ['~/dab/*'] +"NeoBundle 'Valloric/YouCompleteMe.git' + NeoBundle 'tpope/vim-surround.git' NeoBundle 'taglist.vim' NeoBundle 'ifdef-highlighting' @@ -99,6 +105,8 @@ if has("gui_running") endif nnoremap <Leader><F11> :call ToggleFullScreen()<CR> + + set cursorline else colorscheme desert endif @@ -119,6 +127,11 @@ set shiftwidth=4 set tabstop=4 set expandtab +"What highlighting group is the current cursor on ? +function! SyntaxItem() + return synIDattr(synID(line("."),col("."),1),"name") +endfunction + "Nice statusbar set laststatus=2 set statusline= @@ -127,8 +140,10 @@ set statusline+=%f\ " file name set statusline+=%h%m%r%w " flags set statusline+=\[%{strlen(&ft)?&ft:'none'}, " filetype set statusline+=%{&fileencoding}, " encoding -set statusline+=%{&fileformat}]\ " file format -set statusline+=%{strftime('%a\ %b\ %e\ %H:%M')} " hour +set statusline+=%{&fileformat}, " file format +set statusline+=%{((exists(\"+bomb\")\ &&\ &bomb)?\"B,\":\"\")}]\ " BOM +set statusline+=%{strftime('%a\ %b\ %e\ %H:%M')}\ " hour +"set statusline+=%{SyntaxItem()} " syntax highlight group under cursor set statusline+=%= " right align set statusline+=0x%-8B\ " current char set statusline+=%-14.(%l,%c%V%)\ %<%P " offset @@ -266,9 +281,6 @@ inoremap <up> <nop> "very magic search noremap <Leader>/ /\v -"remove adding stars in comments -set formatoptions-=ro - call neobundle#end() filetype plugin indent on |