From 685760fb693aa81e06b59e3eed9c22f319f5e9d6 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Wed, 7 Dec 2016 13:15:40 +0100
Subject: [PATCH] Remove g:startify_mapping_nowait

This option got obsoleted by 07b122f.
---
 autoload/startify.vim | 27 +++++++++++++--------------
 doc/startify.txt      | 13 -------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index d6f49a8..e059935 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -10,8 +10,7 @@ endif
 let g:autoloaded_startify = 1
 
 " Init: values {{{1
-let s:nowait_string  = v:version >= 704 || (v:version == 703 && has('patch1261')) ? '<nowait>' : ''
-let s:nowait         = get(g:, 'startify_mapping_nowait', 1) ? s:nowait_string : ''
+let s:nowait         = v:version >= 704 || (v:version == 703 && has('patch1261')) ? '<nowait>' : ''
 let s:padding_left   = repeat(' ', get(g:, 'startify_padding_left', 3))
 let s:numfiles       = get(g:, 'startify_files_number', 10)
 let s:show_special   = get(g:, 'startify_enable_special', 1)
@@ -88,7 +87,7 @@ function! startify#insane_in_the_membrane() abort
   if s:show_special
     call append('$', [s:padding_left .'[e]  <empty buffer>', ''])
   endif
-  call s:register(line('$')-1, 'e', 'special', 'enew', '', s:nowait_string)
+  call s:register(line('$')-1, 'e', 'special', 'enew', '', s:nowait)
 
   let b:startify.entry_number = 0
   if filereadable('Session.vim')
@@ -128,10 +127,10 @@ function! startify#insane_in_the_membrane() abort
 
   if s:show_special
     call append('$', ['', s:padding_left .'[q]  <quit>'])
-    call s:register(line('$'), 'q', 'special', 'call s:close()', '', s:nowait_string)
+    call s:register(line('$'), 'q', 'special', 'call s:close()', '', s:nowait)
   else
     " Don't overwrite the last regular entry, thus +1
-    call s:register(line('$')+1, 'q', 'special', 'call s:close()', '', s:nowait_string)
+    call s:register(line('$')+1, 'q', 'special', 'call s:close()', '', s:nowait)
   endif
 
   " compute first line offset
@@ -665,7 +664,7 @@ function! s:show_commands() abort
     let [desc, cmd] = type(command) == type([]) ? command : [command, command]
 
     call append('$', s:padding_left .'['. index .']'. repeat(' ', (3 - strlen(index))) . desc)
-    call s:register(line('$'), index, 'special', cmd, '', s:nowait_string)
+    call s:register(line('$'), index, 'special', cmd, '', s:nowait)
 
     unlet entry command
   endfor
@@ -714,14 +713,14 @@ endfunction
 
 " Function: s:set_mappings {{{1
 function! s:set_mappings() abort
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> i             :enew <bar> startinsert<cr>"
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> <insert>      :enew <bar> startinsert<cr>"
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> b             :call <sid>set_mark('B')<cr>"
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> s             :call <sid>set_mark('S')<cr>"
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> t             :call <sid>set_mark('T')<cr>"
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> v             :call <sid>set_mark('V')<cr>"
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> <cr>          :call startify#open_buffers()<cr>"
-  execute "nnoremap <buffer>". s:nowait_string ."<silent> <2-LeftMouse> :call startify#open_buffers()<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> i             :enew <bar> startinsert<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> <insert>      :enew <bar> startinsert<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> b             :call <sid>set_mark('B')<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> s             :call <sid>set_mark('S')<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> t             :call <sid>set_mark('T')<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> v             :call <sid>set_mark('V')<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> <cr>          :call startify#open_buffers()<cr>"
+  execute "nnoremap <buffer>". s:nowait ."<silent> <2-LeftMouse> :call startify#open_buffers()<cr>"
 
   " Without these mappings n/N wouldn't work properly, since autocmds always
   " force the cursor back on the index.
diff --git a/doc/startify.txt b/doc/startify.txt
index 719351c..200ea32 100644
--- a/doc/startify.txt
+++ b/doc/startify.txt
@@ -104,7 +104,6 @@ default values.
     |g:startify_disable_at_vimenter|
     |g:startify_enable_unsafe|
     |g:startify_files_number|
-    |g:startify_mapping_nowait|
     |g:startify_padding_left|
     |g:startify_skiplist_server|
     |g:startify_use_env|
@@ -596,18 +595,6 @@ See |startify-colors| for highlighting them.
 
 $PWD and $OLDPWD are ignored.
 
------------------------------------------------------------------------------
-                                                    *g:startify_mapping_nowait*
->
-    let g:startify_mapping_nowait = 1
-<
-Force the usage of |<nowait>| in all mappings.
-
-This helps guarding against global mappings that start with the same
-characters as the Startify indexes.
-
-NOTE: This option needs at least Vim 7.3.1261. It gets ignored otherwise.
-
 ==============================================================================
 AUTOCMD                                                       *startify-autocmd*