Merge pull request #99: Write correct session lock when (auto-)opening tab-scoped session

Author: xolox

README.md

@@ -256,7 +256,7 @@ Recently this plug-in switched from reimplementing [:mksession][mksession] to ac
 <!-- Start of generated documentation -->
 
 The documentation of the 37 functions below was extracted from
-2 Vim scripts on July 30, 2014 at 21:49.
+2 Vim scripts on July 30, 2014 at 21:54.
 
 ### Public API for the vim-session plug-in
 

autoload/xolox/session.vim

@@ -4,7 +4,7 @@
 " Last Change: July 30, 2014
 " URL: http://peterodding.com/code/vim/session/
 
-let g:xolox#session#version = '2.6.2'
+let g:xolox#session#version = '2.6.3'
 
 " Public API for session persistence. {{{1
 
@@ -560,6 +560,7 @@ function! xolox#session#open_cmd(name, bang, command) abort " {{{2
       call s:lock_session(path)
       execute 'source' fnameescape(path)
       if xolox#session#is_tab_scoped()
+        call s:lock_session(path) " Retroactively (this is only known after the session has been loaded) add the tabpage to the lock.
         let t:session_old_cwd = oldcwd
         let session_type = 'tab scoped'
       else
@@ -1022,7 +1023,7 @@ function! s:vim_instance_id()
   if !empty(v:servername)
     let id['servername'] = v:servername
   endif
-  if !xolox#session#include_tabs()
+  if !xolox#session#include_tabs() || xolox#session#is_tab_scoped()
     let id['tabpage'] = tabpagenr()
   endif
   return id

doc/session.txt

@@ -513,7 +513,7 @@ might take a while...)
 Function reference ~
 
 The documentation of the 37 functions below was extracted from 2 Vim scripts on
-July 30, 2014 at 21:49.
+July 30, 2014 at 21:54.
 
 -------------------------------------------------------------------------------
                                            *public-api-for-vim-session-plug-in*