From 4907187a33da9616cf6b4c11b35cb462c3f2fea7 Mon Sep 17 00:00:00 2001
From: Dan Simmons <dan@simmons.io>
Date: Thu, 8 Jan 2015 13:56:43 -0500
Subject: [PATCH] Moved .vimrc-level settings (pertaining to search) out of
 ./vim/settings/yadr-search.vim and into ./vimrc. Also removed
 unnecessary+problematic viminfo setting.

---
 vim/settings/yadr-search.vim | 8 --------
 vimrc                        | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 vim/settings/yadr-search.vim

diff --git a/vim/settings/yadr-search.vim b/vim/settings/yadr-search.vim
deleted file mode 100644
index 36166ea..0000000
--- a/vim/settings/yadr-search.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-" ================ Search Settings  =================
-
-set incsearch       " Find the next match as we type the search
-set hlsearch        " Hilight searches by default
-set viminfo='100,f1 " Save up to 100 marks, enable capital marks
-set ignorecase      " Ignore case when searching...
-set smartcase       " ...unless we type a capital
-
diff --git a/vimrc b/vimrc
index 57d3bd6..da1e1ad 100644
--- a/vimrc
+++ b/vimrc
@@ -102,6 +102,12 @@ set scrolloff=8         "Start scrolling when we're 8 lines away from margins
 set sidescrolloff=15
 set sidescroll=1
 
+" ================ Search ===========================
+
+set incsearch       " Find the next match as we type the search
+set hlsearch        " Highlight searches by default
+set ignorecase      " Ignore case when searching...
+set smartcase       " ...unless we type a capital
 
 " ================ Custom Settings ========================
 so ~/.yadr/vim/settings.vim