X-Git-Url: http://git.madism.org/?p=~madcoder%2Fdotfiles.git;a=blobdiff_plain;f=vimrc;h=23e3632d30bd583318cf1901954a5a78240e1bcc;hp=993571b43990b4e24eb0372539e7ebc6e58bea48;hb=1f66b92bd417b2e96d9b819a9ca256cfb4e8fe98;hpb=b3792e09bc4258d170d9afc38a23ac446d55490b

diff --git a/vimrc b/vimrc
index 993571b..23e3632 100644
--- a/vimrc
+++ b/vimrc
@@ -100,6 +100,7 @@ set diffopt=filler,context:5,iwhite
 set fillchars+=diff:\ ,vert:│
 
 set makeprg=LC_ALL=C\ make\ MONOCHROME=1
+set grepprg=egrep\ -n\ $*\ /dev/null
 
 exe "set path=." . system("echo | cpp -v 2>&1 | grep '^ .*/include' | tr -d \"\n\" | tr \" \" \",\"")
 set path+=.;/
@@ -244,7 +245,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 = "--no-renames --summary -C -M"
     let c_gnu=1
     let c_space_errors=1
     let c_no_curly_error=1
@@ -363,31 +364,31 @@ if has("gui_running") || &t_Co >= 88
         exec <SID>myhi("Normal",       "none",       "dfdfdf",    "NONE")
         exec <SID>myhi("MoreMsg",      "none",       "dfdfdf",    "NONE")
     endif
-    exec <SID>myhi("Comment",      "none",       "afafff",    "0f0f2f")
-    exec <SID>myhi("Folded",       "none",       "afafff",    "0f0f2f")
+    exec <SID>myhi("Comment",      "none",       "afafff",    "0f0f0f")
+    exec <SID>myhi("Folded",       "none",       "afafff",    "0f0f0f")
 
-    exec <SID>myhi("SpecialKey",   "none",       "dfdfdf",    "0f0f2f")
-    exec <SID>myhi("Todo",         "underline",  "yellow",    "333333")
+    exec <SID>myhi("SpecialKey",   "none",       "dfdfdf",    "0f0f0f")
+    exec <SID>myhi("Todo",         "underline",  "yellow",    "2f2f2f")
     exec <SID>myhi("Error",        "bold",       "white",     "red")
 
-    exec <SID>myhi("Function",     "none",       "4fcfcf",    "NONE")
-    exec <SID>myhi("Identifier",   "none",       "4fcfcf",    "NONE")
+    exec <SID>myhi("Function",     "none",       "4fdfdf",    "NONE")
+    exec <SID>myhi("Identifier",   "none",       "4fdfdf",    "NONE")
 
     exec <SID>myhi("Cursor",       "reverse",    "dfdfdf",    "black")
-    exec <SID>myhi("Visual",       "none",       "NONE",      "333333")
+    exec <SID>myhi("Visual",       "none",       "NONE",      "2f2f2f")
     exec <SID>myhi("IncSearch",    "none",       "black",     "yellow")
     exec <SID>myhi("Search",       "none",       "black",     "yellow")
 
-    exec <SID>myhi("StatusLine",   "none",       "yellow",    "333333")
+    exec <SID>myhi("StatusLine",   "none",       "yellow",    "2f2f2f")
     exec <SID>myhi("StatusLineNc", "none",       "dfdfdf",    "1c1c1c")
-    exec <SID>myhi("WildMenu",     "none",       "white",     "0f0f2f")
-    exec <SID>myhi("VertSplit",    "none",       "darkgray",  "0f0f2f")
+    exec <SID>myhi("WildMenu",     "none",       "white",     "0f0f0f")
+    exec <SID>myhi("VertSplit",    "none",       "darkgray",  "0f0f0f")
     exec <SID>myhi("NonText",      "none",       "darkgray",  "NONE")
 
-    exec <SID>myhi("MatchParen",   "none",       "white",     "0f0f2f")
-    exec <SID>myhi("Pmenu",        "none",       "dfdfdf",    "0f0f2f")
+    exec <SID>myhi("MatchParen",   "none",       "white",     "0f0f0f")
+    exec <SID>myhi("Pmenu",        "none",       "dfdfdf",    "0f0f0f")
     exec <SID>myhi("PmenuSel",     "none",       "white",     "3f3f7f")
-    exec <SID>myhi("PmenuSbar",    "none",       "white",     "0f0f2f")
+    exec <SID>myhi("PmenuSbar",    "none",       "white",     "0f0f0f")
     exec <SID>myhi("PmenuThumb",   "none",       "3f3f7f",    "3f3f7f")
 
     exec <SID>myhi("SpellBad",     "none",       "NONE",      "800000")
@@ -400,10 +401,10 @@ if has("gui_running") || &t_Co >= 88
     exec <SID>myhi("Repeat",       "none",       "bf7f00",    "NONE")
     exec <SID>myhi("Statement",    "none",       "bf7f00",    "NONE")
 
-    exec <SID>myhi("StorageClass", "none",       "3fbf3f",    "NONE")
-    exec <SID>myhi("Type",         "none",       "3fbf3f",    "NONE")
-    exec <SID>myhi("Structure",    "none",       "3fbf3f",    "NONE")
-    exec <SID>myhi("Directory",    "none",       "3fbf3f",    "NONE")
+    exec <SID>myhi("StorageClass", "none",       "20b020",    "NONE")
+    exec <SID>myhi("Type",         "none",       "20b020",    "NONE")
+    exec <SID>myhi("Structure",    "none",       "20b020",    "NONE")
+    exec <SID>myhi("Directory",    "none",       "20b020",    "NONE")
 
     exec <SID>myhi("Include",      "none",       "bf0fbf",    "NONE")
     exec <SID>myhi("PreProc",      "none",       "bf0fbf",    "NONE")