Merge branch 'release-1.1.1'

Author: kopischke

autoload/stay.vim

@@ -6,13 +6,22 @@ set cpo&vim
 " Check if buffer {bufnr} is persistent:
 " @signature:  stay#ispersistent({bufnr:Number}, {volatile_ftypes:List<String>})
 " @returns:    Boolean
+" @notes:      the persistence heuristics are
+"              - buffer must be listed
+"              - buffer must be of ordinary or "acwrite" 'buftype'
+"              - not a preview window
+"              - not a diff window
+"              - buffer's 'bufhidden' must be empty or "hide"
+"              - buffer must not be of a volatile file type
+"              - buffer must map to a readable file
 function! stay#ispersistent(bufnr, volatile_ftypes) abort
   return bufexists(a:bufnr)
     \ && getbufvar(a:bufnr, 'stay_ignore', 0) isnot 1
+    \ && getbufvar(a:bufnr, '&buflisted') is 1
     \ && index(['', 'acwrite'], getbufvar(a:bufnr, '&buftype')) isnot -1
     \ && getbufvar(a:bufnr, '&previewwindow') isnot 1
     \ && getbufvar(a:bufnr, '&diff') isnot 1
-    \ && getbufvar(a:bufnr, '&bufhidden') isnot# 'wipe'
+    \ && index(['', 'hide'], getbufvar(a:bufnr, '&bufhidden')) isnot -1
     \ && index(a:volatile_ftypes, getbufvar(a:bufnr, '&filetype')) is -1
     \ && filereadable(fnamemodify(bufname(a:bufnr), ':p'))
 endfunction

autoload/stay/shim.vim

@@ -0,0 +1,17 @@
+" STAY EVAL SHIM MODULE
+" Are these Vim patch levels, my dear?
+
+" globpath:
+" - no {nosuf} argument before 7.2.051 - :h  version7.txt
+" - no {list}  argument before 7.4.279 - http://ftp.vim.org/pub/vim/patches/7.4/README
+function! stay#shim#globpath(path, glob, nosuf, list) abort
+  if     v:version < 702 || (v:version is 702 && !has('patch-051'))
+    return split(globpath(a:path, a:glob), '\n')
+  elseif v:version < 704 || (v:version is 704 && !has('patch-279'))
+    return split(globpath(a:path, a:glob, a:nosuf), '\n')
+  else
+    return globpath(a:path, a:glob, a:nosuf, a:list)
+  endif
+endfunction
+
+" vim:set sw=2 sts=2 ts=2 et fdm=marker fmr={{{,}}}:

doc/vim-stay.txt

@@ -1,4 +1,4 @@
-*vim-stay.txt*        For Vim version 7.0 or better          version 1.1.0
+*vim-stay.txt*        For Vim version 7.0 or better          version 1.1.1
 
 
 		VIM REFERENCE for the Stay plug-in

plugin/stay.vim

@@ -1,7 +1,7 @@
 " A LESS SIMPLISTIC TAKE ON RESTORE_VIEW.VIM
 " Maintainer: Martin Kopischke <[email protected]>
 " License:    MIT (see LICENSE.md)
-" Version:    1.1.0
+" Version:    1.1.1
 if &compatible || !has('autocmd') || !has('mksession') || v:version < 700
   finish
 endif
@@ -11,7 +11,7 @@ set cpo&vim
 
 " Set defaults:
 let s:defaults = {}
-let s:defaults.volatile_ftypes = ['gitcommit', 'gitrebase', 'netrw']
+let s:defaults.volatile_ftypes = ['gitcommit', 'gitrebase', 'gitsendmail']
 for [s:key, s:val] in items(s:defaults)
   execute 'let g:'.s:key. '= get(g:, "'.s:key.'", '.string(s:val).')'
   unlet! s:key s:val
@@ -20,7 +20,7 @@ endfor
 " Set up 3rd party integrations:
 function! s:integrate() abort
   let s:integrations = []
-  for l:file in globpath(&rtp, 'autoload/stay/integrate/*.vim', 1, 1)
+  for l:file in stay#shim#globpath(&rtp, 'autoload/stay/integrate/*.vim', 1, 1)
     try
       let l:name = fnamemodify(l:file, ':t:r')
       if index(s:integrations, l:name) is -1