From 19899b518f18165b1dfb6d9b4b18e531f4b56249 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+orbitalquark@users.noreply.github.com>
Date: Mon, 12 Apr 2021 01:50:22 -0400
Subject: Fixed a bug where redoing a full-buffer change could jump to an
 unrelated state. Do a simple position save instead of using the history
 mechanism.

---
 modules/textadept/history.lua | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/textadept/history.lua b/modules/textadept/history.lua
index 05081ddd..8c784c17 100644
--- a/modules/textadept/history.lua
+++ b/modules/textadept/history.lua
@@ -33,14 +33,14 @@ local view_history = setmetatable({}, {
   end
 })
 
-local restore_position, first_visible_line = false, nil
+local restore_position, pos, first_visible_line = false, nil, nil
 -- Restore position after a full-buffer undo/redo operation, e.g. after replacing buffer contents
 -- with a formatting command and then performing an undo.
 events.connect(events.UPDATE_UI, function(updated)
   if not restore_position or updated & buffer.UPDATE_SELECTION == 0 then return end
   restore_position = false
-  M.back()
-  view.first_visible_line, first_visible_line = first_visible_line, nil
+  buffer:goto_pos(pos)
+  view.first_visible_line, pos, first_visible_line = first_visible_line, nil, nil
 end)
 
 -- Listens for text insertion and deletion events and records their locations.
@@ -56,8 +56,9 @@ events.connect(events.MODIFIED, function(position, mod, text, length)
   elseif mod & buffer.MOD_DELETETEXT > 0 then
     if buffer.length == 0 then return end -- ignore replacing buffer contents
   elseif mod & (buffer.PERFORMED_UNDO | buffer.PERFORMED_REDO) > 0 and
-      (mod & buffer.MOD_BEFOREDELETE > 0) and length == buffer.length then
-    first_visible_line = view.first_visible_line -- save for potential undo before it's lost
+    (mod & buffer.MOD_BEFOREDELETE > 0) and length == buffer.length then
+    -- Save view state for potential undo before it's lost.
+    pos, first_visible_line = buffer.current_pos, view.first_visible_line
   else
     return
   end
-- 
cgit v1.2.3