From e256d3b5a5dc315d81bd26de7d9e8787c2afa9e4 Mon Sep 17 00:00:00 2001
From: Loic Nageleisen <loic.nageleisen@gmail.com>
Date: Fri, 3 Feb 2012 12:53:51 +0100
Subject: [PATCH] new plugin: indent-object + solve key conflict

---
 .gitmodules          | 3 +++
 bundle/indent-object | 1 +
 vimrc                | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 160000 bundle/indent-object

diff --git a/.gitmodules b/.gitmodules
index e7215c3..ac915fa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,3 +61,6 @@
 [submodule "bundle/glsl"]
 	path = bundle/glsl
 	url = https://github.com/vim-scripts/glsl.vim.git
+[submodule "bundle/indent-object"]
+	path = bundle/indent-object
+	url = https://github.com/michaeljsmith/vim-indent-object
diff --git a/bundle/indent-object b/bundle/indent-object
new file mode 160000
index 0000000..78fffa6
--- /dev/null
+++ b/bundle/indent-object
@@ -0,0 +1 @@
+Subproject commit 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e
diff --git a/vimrc b/vimrc
index 81ff4c5..deaff90 100644
--- a/vimrc
+++ b/vimrc
@@ -125,6 +125,9 @@ set swb=usetab      "make :sb <filename> go to tabs too
 "key mappings
 let mapleader = ','
 
+set hlsearch
+map <leader>s :nohlsearch<CR>
+
 map <leader>R :source ~/.vimrc<CR>
 map <leader>t :CtrlP<CR>
 map <leader>b :CtrlPBuffer<CR>
@@ -135,7 +138,7 @@ map <leader>c :CoffeeCompile<CR>
 command -nargs=1 C CoffeeCompile | :<args>
 
 "session
-nnoremap <leader>s :mksession!<CR>
+nnoremap <leader>S :mksession!<CR>
 
 "Ack
 nnoremap <leader>a :Ack<SPACE>