From 43a31194268d0894da4ac79edff6dbd181da4329 Mon Sep 17 00:00:00 2001
From: crossorbit <cnsworder@gamil.com>
Date: Mon, 9 Jan 2017 08:34:51 +0800
Subject: [PATCH] Remove vundle

---
 README.md      | 6 +++---
 vim/conf.vim   | 4 ++++
 vim/keymap.vim | 3 +++
 vim/plug.vim   | 5 +++--
 vundle         | 1 -
 5 files changed, 13 insertions(+), 6 deletions(-)
 delete mode 160000 vundle

diff --git a/README.md b/README.md
index 7376b16..0e919da 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,14 @@
 
 | 插件 | 用途 |
 | --- | --- |
-| gmarik/vundle, L9 | 包管理 |
+| vim-plug | 包管理 |
 | The-NERD-tree | 目录树 |
 | ctrlpvim/ctrlp.vim, dyng/ctrlsf.vim | 快速搜索 |
 | bling/vim-airline | 状态栏美化 |
 | zenorocha/dracula-theme | 配色 |
 | terryma/vim-multiple-cursors.git | 多光标 |
 | rking/ag.vim， dkprice/vim-easygrep | 搜索 |
-| Lokaltog/vim-easymotion | 搜索定位 |
+| haya14busa/incsearch, justinmk/vim-sneak | 搜索定位 |
 | Plugin TaskList.vim | 任务列表 |
 | mbbill/undotree | 撤销修改 |
 | Yggdroot/indentLine | 缩进提示 |
@@ -30,7 +30,7 @@
 | mattn/gist-vim, tpope/vim-fugitive, airblade/vim-gitgutter | git |
 | scrooloose/nerdcommenter | 代码注释 |
 | Valloric/YouCompleteMe | 智能补全 |
-| scrooloose/syntastic | 代码检查 |
+| scrooloose/ale | 代码检查 |
 | Chiel92/vim-autoformat | 代码格式化 |
 | honza/vim-snippets | 代码段提示 |
 | rizzatti/dash.vim, KabbAmine/zeavim.vim | 帮助文档 |
diff --git a/vim/conf.vim b/vim/conf.vim
index 1990f99..1d285aa 100644
--- a/vim/conf.vim
+++ b/vim/conf.vim
@@ -9,6 +9,7 @@ set encoding=utf-8
 set fileencodings=utf-8,gb18030,gb2312,gbk
 set clipboard=unnamed
 set nobackup
+" set hlsearch
 
 set cscopeprg=gtags-cscope
 "cscope add GTAGS
@@ -30,6 +31,9 @@ if executable('ag')
     "let g:ctrlp_use_caching = 0
 endif
 
+let g:sneak#label = 1
+let g:incsearch#autonohlsearch = 1
+
 "set list
 "let g:indent_guides_auto_colors=1
 "let g:indent_guides_start_level=2
diff --git a/vim/keymap.vim b/vim/keymap.vim
index b926895..79ea9e8 100644
--- a/vim/keymap.vim
+++ b/vim/keymap.vim
@@ -55,6 +55,9 @@ nmap <silent> <leader>i :IndentLinesToggle<cr>
 map / <Plug>(incsearch-forward)
 map ? <Plug>(incsearch-backward)
 map g/ <Plug>(incsearch-stay)
+map z/ <Plug>(incsearch-easymotion-/)
+map z? <Plug>(incsearch-easymotion-?)
+map zg/ <Plug>(incsearch-easymotion-stay)
 
 "replace 'f' with 1-char Sneak
 nmap f <Plug>Sneak_f
diff --git a/vim/plug.vim b/vim/plug.vim
index 7f97311..68c2ed2 100644
--- a/vim/plug.vim
+++ b/vim/plug.vim
@@ -39,8 +39,6 @@ Plug 'Xuyuanp/nerdtree-git-plugin'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'dyng/ctrlsf.vim'
 Plug 'junegunn/fzf.vim'
-Plug 'haya14busa/incsearch.vim'
-Plug 'justinmk/vim-sneak'
 "文件图标
 Plug 'ryanoasis/vim-devicons'
 "bookmark
@@ -74,6 +72,9 @@ Plug 'Lokaltog/vim-easymotion'
 "搜索
 Plug 'rking/ag.vim'
 Plug 'dkprice/vim-easygrep'
+Plug 'haya14busa/incsearch.vim'
+Plug 'justinmk/vim-sneak'
+Plug 'haya14busa/incsearch-easymotion.vim'
 "任务列表
 Plug 'TaskList.vim'
 "撤销树
diff --git a/vundle b/vundle
deleted file mode 160000
index 4984767..0000000
--- a/vundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45