From d2fa06759f005f63bdad8dab7431e11c8b789f00 Mon Sep 17 00:00:00 2001
From: Zac Duncan <zac.duncan@gmail.com>
Date: Tue, 16 Nov 2010 21:08:59 -0600
Subject: [PATCH] moved mappings out of gvimrc into vimrc

---
 gvimrc | 7 -------
 vimrc  | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gvimrc b/gvimrc
index b19b27ec..b2ce641d 100644
--- a/gvimrc
+++ b/gvimrc
@@ -18,13 +18,6 @@ if has("gui_macvim")
   map <D-/> <plug>NERDCommenterToggle<CR>
 endif
 
-" Bubble single lines
-nmap <C-Up> [e
-nmap <C-Down> ]e
-" Bubble multiple lines
-vmap <C-Up> [egv
-vmap <C-Down> ]egv
-
 " Start without the toolbar
 set guioptions-=T
 
diff --git a/vimrc b/vimrc
index 2b74a041..d9d3b72d 100644
--- a/vimrc
+++ b/vimrc
@@ -84,6 +84,13 @@ map <Leader>te :tabe <C-R>=expand("%:p:h") . "/" <CR>
 " Command mode: Ctrl+P
 cmap <C-P> <C-R>=expand("%:p:h") . "/" <CR>
 
+" Bubble single lines
+nmap <C-Up> [e
+nmap <C-Down> ]e
+" Bubble multiple lines
+vmap <C-Up> [egv
+vmap <C-Down> ]egv
+
 " Use modeline overrides
 set modeline
 set modelines=10