From 028ad988d956c0deda7d7073b32873b23a4f1f74 Mon Sep 17 00:00:00 2001
From: Matthias Braendli <matthias.braendli@u-blox.com>
Date: Thu, 22 Jan 2015 09:00:32 +0100
Subject: update colorscheme

---
 colors/bramwombat.vim | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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
-- 
cgit v1.2.3


From 45ab21f4f6a2fde2076ed0cb37c702528287ac97 Mon Sep 17 00:00:00 2001
From: Matthias Braendli <matthias.braendli@u-blox.com>
Date: Thu, 22 Jan 2015 09:02:12 +0100
Subject: add undodir, cursorline, other updates

---
 bundle/neobundle.vim |  2 +-
 dotvimrc             | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/bundle/neobundle.vim b/bundle/neobundle.vim
index 816d21d..e4e6766 160000
--- a/bundle/neobundle.vim
+++ b/bundle/neobundle.vim
@@ -1 +1 @@
-Subproject commit 816d21d99a071cc86ba2ffbb4679dde3b764bed7
+Subproject commit e4e6766e7bbcac9b7048ee247f02af9020b9df29
diff --git a/dotvimrc b/dotvimrc
index bae820f..5592c4a 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -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
@@ -69,6 +73,8 @@ let g:clang_snippets = 1
 let g:clang_snippets_engine = 'clang_complete'
 noremap <Leader>c :call g:ClangUpdateQuickFix()<cr>
 
+"NeoBundle 'Valloric/YouCompleteMe.git'
+
 NeoBundle 'tpope/vim-surround.git'
 NeoBundle 'taglist.vim'
 NeoBundle 'ifdef-highlighting'
@@ -100,6 +106,8 @@ if has("gui_running")
     endif
 
     nnoremap <Leader><F11> :call ToggleFullScreen()<CR>
+
+    set cursorline
 else
     colorscheme desert
 endif
@@ -120,6 +128,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=
@@ -128,8 +141,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
@@ -267,9 +282,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
-- 
cgit v1.2.3