add submodule update --rebase

[~madcoder/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index c849db9..674805c 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -99,7 +99,7 @@ set cinoptions+=m1             " aligh the closing ) properly
 set diffopt=filler,context:5,iwhite
 set fillchars+=diff:\ ,vert:│
 
-set makeprg=LC_ALL=C\ make\ M=1
+set makeprg=LC_ALL=C\ make\ MONOCHROME=1
 
 exe "set path=." . system("echo | cpp -v 2>&1 | grep '^ .*/include' | tr -d \"\n\" | tr \" \" \",\"")
 set path+=.;/
@@ -244,7 +244,7 @@ if has("autocmd")
 
     let ocaml_noindent_let=1
     let git_diff_spawn_mode=2
-    let git_diff_opts = "--patience -C -C -M -B"
+    let git_diff_opts = "--patience -C -C -M"
     let c_gnu=1
     let c_space_errors=1
     let c_no_curly_error=1