2 files changed, 10 insertions, 2 deletions

diff --git a/vim/init/config.vim b/vim/init/config.vim
index 74cbd39..4676942 100644
--- a/vim/init/config.vim
+++ b/vim/init/config.vim
@@ -188,11 +188,13 @@ augroup InitFileTypes
     endif
 
     " Fold for heading and the following contents
-    let hash_num = matchstr(getline(v:lnum), '^#\+')
+    let hash_num = matchstr(getline(v:lnum), '^\zs#\+\ze\s')
     if !empty(hash_num)
       let foldlevel = g:markdown_apply_heading_level ? len(hash_num) - 1 : 1
       " HEADING
       return len(hash_num) == 1 ? 0 : '>'.foldlevel
+    elseif match(getline(v:lnum), '^----') != -1
+      return "<"
     else
       " Contents
       return "="
diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index c0af8c8..bf3d7ab 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -92,6 +92,11 @@ nnoremap gF :e <cfile><CR>
 xnoremap iq i"
 xnoremap aq a"
 
+nnoremap ze zszH
+
+nnoremap 0 ^
+nnoremap ^ 0
+
 
 " READLINE {{{
 
@@ -495,8 +500,9 @@ function! CloseBufferSafely()
     tabclose
   else
     " Switch to proper buffer
-    let next_buf = get(t:bufs, bufnr('#')) ? bufnr('#') : filter(t:bufs, 'v:val != '..bufnr)[0]
+    let next_buf = get(t:bufs, bufnr('#')) ? bufnr('#') : filter(t:bufs, 'v:val != '..bufnr)[-1]
     exe "b "..next_buf
+    " exe "buffer ".g:lastbuffer
     call filter(t:bufs, 'v:val != '..bufnr)
   endif