From e0b295a725cb57e26bbcf30689d2578482c44c5b Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Mon, 29 Jul 2013 10:32:59 +0200
Subject: [PATCH 1/3] Remember mappings until <cr> is hit

A certain branch tried to execute buffer-local mappings after calling
:enew. Therefore the mappings didn't exist anymore.

References #30.
---
 autoload/startify.vim | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index 5f9b40f..5f05834 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -90,8 +90,7 @@ function! startify#insane_in_the_membrane() abort
     execute 'nnoremap <buffer><silent> '. g:startify_empty_buffer_key .' :enew<cr>'
   endif
 
-  autocmd! startify *
-  autocmd  startify CursorMoved <buffer> call s:set_cursor()
+  autocmd startify CursorMoved <buffer> call s:set_cursor()
 
   call cursor((s:show_special ? 4 : 2) + s:offset_header, 5)
 endfunction
@@ -354,8 +353,8 @@ endfunction
 
 " Function: s:open_buffers {{{1
 function! s:open_buffers(cword) abort
-  enew
   if exists('s:marked') && !empty(s:marked)
+    enew
     for i in range(len(s:marked))
       for val in values(s:marked)
         if val[0] == i

From ae062f2b6fdc61d28eccf27400b2c104cd803f23 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Mon, 29 Jul 2013 12:41:27 +0200
Subject: [PATCH 2/3] Unlet s:marked after execution

This lead to nasty bugs because Startify would take the wrong branch to
open the new buffers.

References #30.
---
 autoload/startify.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index 5f05834..4ea66f7 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -380,6 +380,10 @@ function! s:open_buffers(cword) abort
   else
     execute 'normal' a:cword
   endif
+  if exists('s:marked')
+    unlet s:marked
+    unlet s:nmarked
+  endif
 endfunction
 
 " Function: s:close {{{1

From 428d7f5a35bcde0d5ad0b72c8f5d5361c97af75e Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Mon, 29 Jul 2013 14:53:00 +0200
Subject: [PATCH 3/3] Prevent empty buffers

References #30.
---
 autoload/startify.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index 4ea66f7..0962f13 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -355,6 +355,7 @@ endfunction
 function! s:open_buffers(cword) abort
   if exists('s:marked') && !empty(s:marked)
     enew
+    setlocal nobuflisted
     for i in range(len(s:marked))
       for val in values(s:marked)
         if val[0] == i