Merge branch 'release-1.0.1'

Author: kopischke

autoload/stay/view.vim

@@ -4,7 +4,7 @@ let s:cpo = &cpo
 set cpo&vim
 
 " Make a persistent view for window {winnr}:
-" @signature:  stay#mkview({winnr:Number})
+" @signature:  stay#view#make({winnr:Number})
 " @returns:    Boolean
 function! stay#view#make(winnr) abort
   if a:winnr is -1
@@ -14,41 +14,58 @@ function! stay#view#make(winnr) abort
   try
     let l:lazyredraw = &lazyredraw
     set lazyredraw
-    let l:curwinnr   = s:gotowin(a:winnr)
+    if !s:win.goto(a:winnr)
+      return 0
+    endif
     unlet! b:stay_atpos
     mkview
-    call s:gotowin(l:curwinnr)
+    call s:win.back()
     return 1
   finally
     let &lazyredraw = l:lazyredraw
   endtry
 endfunction
 
 " Load a persistent view for window {winnr}:
-" @signature:  stay#loadview({winnr:Number})
+" @signature:  stay#view#load({winnr:Number})
 " @returns:    Boolean
 function! stay#view#load(winnr) abort
-  if a:winnr is -1
+  if a:winnr is -1 || !s:win.goto(a:winnr)
     return 0
   endif
 
-  let l:curwinnr = s:gotowin(a:winnr)
   noautocmd silent loadview
   if exists('b:stay_atpos')
     call cursor(b:stay_atpos[0], b:stay_atpos[1])
     silent! normal! zOzz
   endif
-  call s:gotowin(l:curwinnr)
+  call s:win.back()
   return 1
 endfunction
 
 " Private helper functions:
-function! s:gotowin(winnr) abort
-  let l:curwinnr = winnr()
-  if a:winnr isnot l:curwinnr
-    execute 'silent!' a:winnr.'wincmd w'
+" - window navigation stack
+let s:win = {'stack': []}
+
+function! s:win.activate(winnr) abort
+  if winnr() isnot a:winnr
+    execute 'noautocmd keepjumps keepalt silent' a:winnr.'wincmd w'
+  endif
+endfunction
+
+function! s:win.goto(winnr) abort
+  let l:oldwinnr = winnr()
+  call self.activate(a:winnr)
+  call add(self.stack, l:oldwinnr)
+  return winnr() is a:winnr
+endfunction
+
+function! s:win.back() abort
+  if len(self.stack) > 0
+    let l:towinnr = remove(self.stack, -1)
+    call self.activate(l:towinnr)
   endif
-  return l:curwinnr
+  return exists('l:towinnr') && winnr() is l:towinnr
 endfunction
 
 let &cpo = s:cpo

doc/vim-stay.txt

@@ -1,4 +1,4 @@
-*vim-stay.txt*        For Vim version 7.0 or better          version 1.0.0
+*vim-stay.txt*        For Vim version 7.0 or better          version 1.0.1
 
 
 		VIM REFERENCE for the Stay plug-in
@@ -36,17 +36,17 @@ The following, non-standard 'viewoptions' settings are recommended:
 
 IGNORED FILE TYPES:				*g:volatile_ftypes*
 
-vim-stay applies heuristics to detect volatile file types, but certain file
-types escape these and need to be expressly marked as volatile (meaning
-buffers of this file type will never be persisted).
-
-Volatile file types are stored in the `volatile_ftypes` global List. To
-overwrite this list, do
->
-	let g:volatile_ftypes = ['foo', 'bar']
-<
-any time before or after the plug-in has loaded. To add to this list without
-overwriting the defaults, make sure the plug-in has loaded, then do
+vim-stay applies heuristics to detect buffers that should not be persisted,
+but in some cases non-persistent buffers slip through. Some of them are
+regular files that are not persistent by their very nature (like git commit
+messages), a few are buffers created by plug-ins that miss all indication
+that they are not files. These can be expressly marked as volatile (meaning
+buffers of this type will never be persisted) by adding their 'filetype' to
+the `volatile_ftypes` global |List|.
+
+Note this list is meant as a safety net for the case heuristics fail; it
+usually should not be necessary to modify vim-stay's defaults. If you find
+you need to add file types to it, make sure the plug-in has loaded, then do
 >
 	let g:volatile_ftypes += ['foo', 'bar']
 <
@@ -58,10 +58,10 @@ INTEGRATION WITH 3RD PARTY PLUG-INS:
 
 Out of the box, vim-stay integrates with the following plug-ins:
 
-1. vim-stay	http://www.vim.org/scripts/script.php?script_id=5089
+1. vim-fetch	http://www.vim.org/scripts/script.php?script_id=5089
 
-If you'd like vim-stay to integrate with other position-setting plug-ins, open
-an issue or a PR at
+If you'd like vim-stay to integrate with other position-setting or view
+management plug-ins, open an issue or a PR at
 
     https://github.com/kopischke/vim-stay/issues
 

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.0.0
+" Version:    1.0.1
 if &compatible || !has('autocmd') || !has('mksession') || v:version < 700
   finish
 endif