From 34bc83671f9ed274c49bbd1c29a17cc0a12d7c42 Mon Sep 17 00:00:00 2001
From: yan <yan@pritzker.ws>
Date: Tue, 22 Nov 2011 10:36:09 -0600
Subject: [PATCH] Clean up conflict of M window move with marks

(changed M to \m for show marks)
---
 README.md |  2 +-
 vimrc     | 32 +++++++++++++-------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 6c5efc5a..e460cd25 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ These are things I use every day to be insanely productive. Hope you like em.
  * T - Tag list (list of methods in a class)
  * K - git grep for the Kurrent word under the cursor
  * O - Open a GitGrep command line with a quote pretyped (close the quote yourself)
- * M - show my Marks (set a mark with mX where X is a letter, navigate to mark using 'X). Uppercase marks to mark files, lowercase marks to use within a file.
+ * \m - show my Marks (set a mark with mX where X is a letter, navigate to mark using 'X). Uppercase marks to mark files, lowercase marks to use within a file.
  * Z - jump back and forth between last two buffers
  * Q - Quit a window (normally Ctrl-w,c)
  * \Q - Kill a buffer completely (normally :bw)
diff --git a/vimrc b/vimrc
index c0392120..8a5be6c2 100644
--- a/vimrc
+++ b/vimrc
@@ -134,23 +134,14 @@ if has("gui_running")
 		"tell the term has 256 colors
 		set t_Co=256
 
-    if has("gui_gnome")
-        set term=gnome-256color
-        colorscheme desert
-    else
-        colorscheme railscasts 
-        set guitablabel=%M%t
-        set lines=60
-        set columns=190
-    endif
-    if has("gui_mac") || has("gui_macvim")
-        set guifont=Monaco:h17
-        set guifont=Inconsolata:h20 " if available, this one is nicer
-    endif
-    if has("gui_win32") || has("gui_win32s")
-        set guifont=Consolas:h12
-				set enc=utf-8
-    endif
+    " colorscheme railscasts 
+    colorscheme solarized
+    set guitablabel=%M%t
+    set lines=60
+    set columns=190
+
+    set guifont=Monaco:h17
+    set guifont=Inconsolata:h20 " if available, this one is nicer
 else
 		"dont load csapprox if we no gui support - silences an annoying warning
     let g:CSApprox_loaded = 1
@@ -364,9 +355,12 @@ nmap <silent> S \lj
 let g:LustyJugglerSuppressRubyWarning = 1
 let g:LustyJugglerAltTabMode = 1
 
-" Show me all my marks (using showmarks plugin)
-nnoremap <silent> M :PreviewMarks<CR>
+" Show me all my marks (using showmarks plugin) using \m
+nnoremap <silent> <Leader>m :PreviewMarks<CR>
 
 " copy current filename into system clipboard - mnemonic: (c)urrent(f)ilename
 " this is helpful to paste someone the path you're looking at
 nnoremap <silent> cf :let @* = expand("%:p")<CR>
+
+" For fugitive.git, dp means :diffput. Define dg to mean :diffget
+nnoremap <silent> dg :diffget<CR>