fix: restore cursor to correct position

stevearc · Sep 19, 2023 · d1831b3 · d1831b3
1 parent 52e556b
commit d1831b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lua/resession/init.lua b/lua/resession/init.lua
@@ -503,10 +503,14 @@ M.load = function(name, opts)
     if buf.loaded then
       vim.fn.bufload(bufnr)
       vim.b[bufnr]._resession_need_edit = true
+      vim.b[bufnr].resession_restore_last_pos = true
       vim.api.nvim_create_autocmd("BufEnter", {
         desc = "Resession: complete setup of restored buffer",
         callback = function(args)
-          pcall(vim.api.nvim_win_set_cursor, 0, buf.last_pos)
+          if vim.b[args.buf].resession_restore_last_pos then
+            pcall(vim.api.nvim_win_set_cursor, 0, buf.last_pos)
+            vim.b[args.buf].resession_restore_last_pos = nil
+          end
           -- This triggers the autocmds that set filetype, syntax highlighting, and checks the swapfile
           if vim.b._resession_need_edit then
             vim.b._resession_need_edit = nil

diff --git a/lua/resession/layout.lua b/lua/resession/layout.lua
@@ -143,6 +143,7 @@ local function set_winlayout_data(layout, scale_factor, visit_data)
       vim.o.eventignore = ""
       vim.api.nvim_buf_set_option(bufnr, "filetype", vim.bo[bufnr].filetype)
       vim.o.eventignore = "all"
+      vim.b[bufnr].resession_restore_last_pos = nil
     end
     pcall(vim.api.nvim_win_set_cursor, win.winid, win.cursor)
     util.restore_win_options(win.winid, win.options)