From 585a9fd16bb47b9b65ef2308dc3baf8dde864600 Mon Sep 17 00:00:00 2001
From: Rane Brown <rane.brown@gmail.com>
Date: Sun, 14 Jul 2019 21:50:49 -0600
Subject: [PATCH] Fix paths and add some additional settings

---
 test/vimrc | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/test/vimrc b/test/vimrc
index 142c4fe..9eb0c89 100644
--- a/test/vimrc
+++ b/test/vimrc
@@ -8,15 +8,15 @@ syntax enable
 
 " default syntax
 let vimwiki_default = {}
-let vimwiki_default.path = '~/vimwiki/default'
-let vimwiki_default.path_html = '~/vimwiki/default/html'
+let vimwiki_default.path = 'test/resources/vimwiki/default'
+let vimwiki_default.path_html = 'test/resources/default/html'
 let vimwiki_default.syntax = 'default'
 let vimwiki_default.ext = '.wiki'
 let vimwiki_default.name = 'DefaultSyntax'
 
 " markdown syntax - https://github.github.com/gfm/
 let vimwiki_markdown = {}
-let vimwiki_markdown.path = '~/vimwiki/markdown'
+let vimwiki_markdown.path = 'test/resources/vimwiki/markdown'
 let vimwiki_markdown.path_html = '~/vimwiki/markdown/html'
 let vimwiki_markdown.syntax = 'markdown'
 let vimwiki_markdown.ext = '.md'
@@ -24,11 +24,38 @@ let vimwiki_markdown.name = 'MarkdownSyntax'
 
 " mediawiki syntax - https://www.mediawiki.org/wiki/Help:Formatting
 let vimwiki_mediawiki = {}
-let vimwiki_mediawiki.path = '~/vimwiki_mediawiki'
-let vimwiki_mediawiki.path_html = '~/vimwiki/mediawiki/html'
+let vimwiki_mediawiki.path = 'test/resources/vimwiki/mediawiki'
+let vimwiki_mediawiki.path_html = 'test/resources/vimwiki/mediawiki/html'
 let vimwiki_mediawiki.syntax = 'mediawiki'
 let vimwiki_mediawiki.ext = '.mw'
 let vimwiki_mediawiki.name = 'MediaWikiSyntax'
 
 " register the 3 wikis
 let g:vimwiki_list = [vimwiki_default, vimwiki_markdown, vimwiki_mediawiki]
+
+" basic settings
+set backspace=indent,eol,start
+set wildmode=longest:full,full
+set wildmenu
+set wildignorecase
+set splitbelow
+set splitright
+set timeoutlen=600
+set ignorecase
+set smartcase
+set hidden
+set laststatus=2
+set hlsearch
+
+" use ctrl-p/n for history completion instead of up/down arrows
+cnoremap <C-p> <Up>
+cnoremap <C-n> <Down>
+
+" jj to go back to command mode
+inoremap jj <esc>
+
+" Use <C-L> to clear the highlighting of :set hlsearch and also preserve the
+" default behavior of redrawing the screen
+if maparg('<C-L>', 'n') ==# ''
+    nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
+endif