From 49eac21edc25497b6ec0746262b7cb306b26989e Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 20 Aug 2016 19:37:34 +0200
Subject: Add j to formatoptions for comment Join

---
 dotvimrc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dotvimrc')

diff --git a/dotvimrc b/dotvimrc
index c49a1ef..d40b183 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -15,6 +15,8 @@ set number
 set grepprg=grep\ -nH\ $*
 let g:tex_flavor = "latex"
 
+setglobal formatoptions+=j
+
 " so that :find and :tabfind work
 set path=$PWD/**
 
-- 
cgit v1.2.3


From 228512c9ddb8ddcf0db7a8852b0822974c53f9c6 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 20 Aug 2016 19:37:48 +0200
Subject: Remove speeddating

---
 dotvimrc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'dotvimrc')

diff --git a/dotvimrc b/dotvimrc
index d40b183..2a19dea 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -89,7 +89,6 @@ let g:ycm_always_populate_location_list = 1
 NeoBundle 'tpope/vim-surround.git'
 NeoBundle 'taglist.vim'
 NeoBundle 'ifdef-highlighting'
-NeoBundle 'tpope/vim-speeddating' " can do C-A and C-X on dates!
 NeoBundle 'ciaranm/detectindent' "adapts tabstop and this shit automagically
 
 NeoBundle "scrooloose/nerdtree"
-- 
cgit v1.2.3


From bb38d30f863013e0932964d99f7616a5ccd4d2ad Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 20 Aug 2016 19:38:00 +0200
Subject: Change from Inconsolata to Source Code Pro

---
 dotvimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dotvimrc')

diff --git a/dotvimrc b/dotvimrc
index 2a19dea..862e4e9 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -114,7 +114,7 @@ elseif has("gui_running")
     colorscheme bramwombat
 
     if has("gui_gtk2")
-        set guifont=Inconsolata\ Medium\ 12
+        set guifont=Source\ Code\ Pro\ Medium\ 10
     elseif has("gui_win32")
         set guifont=Lucida_Console:h10:cANSI
     endif
-- 
cgit v1.2.3


From 763e6c068cdea8978ed324ac16e028b70310c970 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sat, 20 Aug 2016 19:38:19 +0200
Subject: Add <Leader>m make shortcut

---
 dotvimrc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dotvimrc')

diff --git a/dotvimrc b/dotvimrc
index 862e4e9..4d1fedf 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -220,6 +220,8 @@ endfun
 noremap <F4> :call MPB_Flip_Ext()<CR>
 noremap <Leader>f :call MPB_Flip_Ext()<CR>
 
+noremap <Leader>m :make -j4<CR>
+
 "Show trailing whitespace
 highlight ExtraWhitespace ctermbg=darkgreen guibg=#344011
 autocmd BufEnter * exe ':2match ExtraWhitespace /\s\+$\| \+\ze\t\|\t\+\ze /'
-- 
cgit v1.2.3