From a69b5c5ae3ccdb240cea26fdbe0395c8bca480d1 Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Wed, 26 Sep 2012 15:17:17 -0700
Subject: [PATCH] Switched to @skwp fork of YankRing without evil @ mapping

---
 .gitmodules                     | 15 ++++++++++-----
 vim/after/plugin/yankring.vim   |  3 ---
 vim/bundle/skwp-YankRing        |  1 +
 vim/bundle/vim-scripts-YankRing |  1 -
 4 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 vim/after/plugin/yankring.vim
 create mode 160000 vim/bundle/skwp-YankRing
 delete mode 160000 vim/bundle/vim-scripts-YankRing

diff --git a/.gitmodules b/.gitmodules
index 17834f30..8ef0c379 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -322,22 +322,27 @@
 	path = vim/bundle/skwp-vim-powerline
 	url = https://github.com/skwp/vim-powerline.git
   ignore = dirty
-[submodule "vim/bundle/vim-scripts-YankRing"]
-	path = vim/bundle/vim-scripts-YankRing
-	url = https://github.com/vim-scripts/YankRing.vim
-  ignore = dirty
 [submodule "vim/bundle/vim-scripts-SearchComplete"]
 	path = vim/bundle/vim-scripts-SearchComplete
 	url = https://github.com/vim-scripts/SearchComplete.git
+  ignore = dirty
 [submodule "vim/bundle/briancollins-vim-jst"]
 	path = vim/bundle/briancollins-vim-jst
 	url = https://github.com/briancollins/vim-jst
+  ignore = dirty
 [submodule "vim/bundle/pangloss-vim-javascript"]
 	path = vim/bundle/pangloss-vim-javascript
 	url = https://github.com/pangloss/vim-javascript
+  ignore = dirty
 [submodule "vim/bundle/chrisbra-NrrwRgn"]
 	path = vim/bundle/chrisbra-NrrwRgn
 	url = https://github.com/chrisbra/NrrwRgn
+  ignore = dirty
 [submodule "zsh/prezto"]
 	path = zsh/prezto
-	url = git://github.com/sorin-ionescu/prezto.git
+	url = https://github.com/sorin-ionescu/prezto.git
+  ignore = dirty
+[submodule "vim/bundle/skwp-YankRing"]
+	path = vim/bundle/skwp-YankRing
+	url = https://github.com/skwp/YankRing.vim
+  ignore = dirty
diff --git a/vim/after/plugin/yankring.vim b/vim/after/plugin/yankring.vim
deleted file mode 100644
index 863292f1..00000000
--- a/vim/after/plugin/yankring.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-"bad yankring! leave my macro mapping alone.
-nunmap @
-
diff --git a/vim/bundle/skwp-YankRing b/vim/bundle/skwp-YankRing
new file mode 160000
index 00000000..25c3c3d1
--- /dev/null
+++ b/vim/bundle/skwp-YankRing
@@ -0,0 +1 @@
+Subproject commit 25c3c3d1f3056c925987c8693cf5ad527ab67164
diff --git a/vim/bundle/vim-scripts-YankRing b/vim/bundle/vim-scripts-YankRing
deleted file mode 160000
index 8ebc225b..00000000
--- a/vim/bundle/vim-scripts-YankRing
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ebc225b364887c0557ab47ab2ca752a70123bee