From ceaf82503fbfd7ccce6a0670de2f5ce0e1258e01 Mon Sep 17 00:00:00 2001
From: yan <yan@pritzker.ws>
Date: Fri, 16 Dec 2011 00:30:43 -0800
Subject: [PATCH] Anonymous bookmarking with ,bb ,bn ,bp ,bc

---
 .gitmodules                         |  3 +++
 README.md                           |  7 +++++++
 vim/bundle/dterei-VimBookmarking    |  1 +
 vim/plugin/settings/conqueterm.vim  |  2 +-
 vim/plugin/settings/skwp-keymap.vim | 12 ++++++++++++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 160000 vim/bundle/dterei-VimBookmarking

diff --git a/.gitmodules b/.gitmodules
index 71a0c03..f87b063 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -148,3 +148,6 @@
 [submodule "vim/bundle/vim-scripts-ZoomWin"]
 	path = vim/bundle/vim-scripts-ZoomWin
 	url = https://github.com/vim-scripts/ZoomWin.git
+[submodule "vim/bundle/dterei-VimBookmarking"]
+	path = vim/bundle/dterei-VimBookmarking
+	url = https://github.com/dterei/VimBookmarking
diff --git a/README.md b/README.md
index 4eacf77..0601133 100644
--- a/README.md
+++ b/README.md
@@ -191,6 +191,12 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
  * gcp (comment a paragraph) added
  * ,t - Command-T fuzzy file selector (alternative to PeepOpen / LustyJuggler)
 
+ Local Anonymous Bookmarking
+
+ * ,bb - toggle local anonymous bookmark at current location
+ * ,bn ,bp - next and previous anonymous bookmark
+ * ,bc - clear anonymous bookmarks
+
 Included vim plugins
 ---
 
@@ -203,6 +209,7 @@ Included vim plugins
  * LustyJuggler/Explorer - hit B, type buf name to match a buffer, or type S and use the home row keys to select a buffer
  * TagList - hit ,T to see a list of methods in a class (uses ctags)
  * CommandT - although I personally use PeepOpen, this is available as it's pretty standard
+ * VimBookmarks - toggle an anonymous bookmark ,bb and go thru them ,bn ,bp and clear them ,bc
 
  Git
 
diff --git a/vim/bundle/dterei-VimBookmarking b/vim/bundle/dterei-VimBookmarking
new file mode 160000
index 0000000..95a809c
--- /dev/null
+++ b/vim/bundle/dterei-VimBookmarking
@@ -0,0 +1 @@
+Subproject commit 95a809c05aebe0404b1619a5a21124133b435976
diff --git a/vim/plugin/settings/conqueterm.vim b/vim/plugin/settings/conqueterm.vim
index 0d87be8..fef4583 100644
--- a/vim/plugin/settings/conqueterm.vim
+++ b/vim/plugin/settings/conqueterm.vim
@@ -6,6 +6,6 @@ let g:ConqueTerm_Color = 2
 " Open up a variety of commands in the ConqueTerm
 nmap <silent> <Leader>cc :execute 'ConqueTermSplit script/console --irb=pry'<CR>
 nmap <silent> <Leader>pp :execute 'ConqueTermSplit pry'<CR>
-nmap <silent> <Leader>bb :execute 'ConqueTermSplit /bin/bash --login'<CR>
+nmap <silent> <Leader>zz :execute 'ConqueTermSplit zsh'<CR>
 
 let g:ConqueTerm_SendVisKey = '<Leader>e'
diff --git a/vim/plugin/settings/skwp-keymap.vim b/vim/plugin/settings/skwp-keymap.vim
index 4b7c6fd..a7e1d96 100644
--- a/vim/plugin/settings/skwp-keymap.vim
+++ b/vim/plugin/settings/skwp-keymap.vim
@@ -151,8 +151,20 @@ nnoremap <D-*> :let @/='\<<C-R>=expand("<cword>")<CR>\>'<CR>:set hls<CR>
 nnoremap ' `
 nnoremap ` '
 
+" ============================
+" VimBookmarking
+" ============================
+"
+" Set anonymous bookmarks
+nmap ,bb :ToggleBookmark<cr>
+nmap ,bn :NextBookmark<cr>
+nmap ,bp :PreviousBookmark<cr>
+nmap ,bc :ClearBookmarks<cr>
+"
 " ============================
 " Abbreviations to use...
 " ============================
 " snippets that are expanded with space
 abbr pry! require 'pry'; binding.pry 
+
+