neovim
diff --git a/‎src/nvim/ex_docmd.c
Copy file name to clipboardExpand all lines: src/nvim/ex_docmd.c
+1Lines changed: 1 addition & 0 deletions b/‎src/nvim/ex_docmd.c
Copy file name to clipboardExpand all lines: src/nvim/ex_docmd.c
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎test/functional/ex_cmds/mksession_spec.lua
Copy file name to clipboardExpand all lines: test/functional/ex_cmds/mksession_spec.lua
+23Lines changed: 23 additions & 0 deletions b/‎test/functional/ex_cmds/mksession_spec.lua
Copy file name to clipboardExpand all lines: test/functional/ex_cmds/mksession_spec.lua
+23Lines changed: 23 additions & 0 deletions
@@ -9130,6 +9130,7 @@ makeopens(
           || put_eol(fd) == FAIL) {
         return FAIL;
       }
+      did_lcd = true;
     }
 
     /* Don't continue in another tab page when doing only the current one
 
@@ -47,4 +47,27 @@ describe(':mksession', function()
     command('tabnext 2')
     eq(cwd_dir .. get_pathsep() .. tab_dir, funcs.getcwd())
   end)
+
+  it('restores buffers when using tab-local working directories', function()
+    local tmpfile_base = file_prefix .. '-tmpfile'
+    local cwd_dir = funcs.getcwd()
+    local session_path = cwd_dir .. get_pathsep() .. session_file
+
+    command('edit ' .. tmpfile_base .. '1')
+    command('tcd ' .. tab_dir)
+    command('tabnew')
+    command('edit ' .. cwd_dir .. get_pathsep() .. tmpfile_base .. '2')
+    command('tabfirst')
+    command('mksession ' .. session_path)
+
+    -- Create a new test instance of Nvim.
+    clear()
+
+    -- Use :silent to avoid press-enter prompt due to long path
+    command('silent source ' .. session_path)
+    command('tabnext 1')
+    eq(cwd_dir .. get_pathsep() .. tmpfile_base .. '1', funcs.expand('%:p'))
+    command('tabnext 2')
+    eq(cwd_dir .. get_pathsep() .. tmpfile_base .. '2', funcs.expand('%:p'))
+  end)
 end)
Original file line number	Diff line number	Diff line change
`@@ -9130,6 +9130,7 @@ makeopens(`
`9130`	`9130`	`\|\| put_eol(fd) == FAIL) {`
`9131`	`9131`	`return FAIL;`
`9132`	`9132`	`}`
	`9133`	`+ did_lcd = true;`
`9133`	`9134`	`}`
`9134`	`9135`
`9135`	`9136`	`/* Don't continue in another tab page when doing only the current one`