about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2023-12-03 11:25:16 -0800
committerKartik K. Agaram <vc@akkartik.com>2023-12-03 11:25:16 -0800
commitdf2cfb820d23e7f5016c5b790d59d5732cb93308 (patch)
tree2bdad8a8b54a6ef3a789d1d6283e0fb1123e303d
parent52ffb40d790cc42ce46ff975bba890ff9f0b0009 (diff)
parent0d3db19c854cc70b82e9935c7ae8f6ad6986d89f (diff)
downloadview.love-df2cfb820d23e7f5016c5b790d59d5732cb93308.tar.gz
Merge lines.love
-rw-r--r--edit.lua5
-rw-r--r--source_edit.lua5
2 files changed, 0 insertions, 10 deletions
diff --git a/edit.lua b/edit.lua
index 8a7cd10..e4325f4 100644
--- a/edit.lua
+++ b/edit.lua
@@ -259,7 +259,6 @@ function edit.text_input(State, t)
     State.search_term = State.search_term..t
     Text.search_next(State)
   else
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     Text.text_input(State, t)
   end
   schedule_save(State)
@@ -315,7 +314,6 @@ function edit.keychord_press(State, chord, key)
     Text.redraw_all(State)
   -- undo
   elseif chord == 'C-z' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     local event = undo_event(State)
     if event then
       local src = event.before
@@ -329,7 +327,6 @@ function edit.keychord_press(State, chord, key)
       schedule_save(State)
     end
   elseif chord == 'C-y' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     local event = redo_event(State)
     if event then
       local src = event.after
@@ -351,14 +348,12 @@ function edit.keychord_press(State, chord, key)
       App.set_clipboard(s)
     end
   elseif chord == 'C-x' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     local s = Text.cut_selection(State, State.left, State.right)
     if s then
       App.set_clipboard(s)
     end
     schedule_save(State)
   elseif chord == 'C-v' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     -- We don't have a good sense of when to scroll, so we'll be conservative
     -- and sometimes scroll when we didn't quite need to.
     local before_line = State.cursor1.line
diff --git a/source_edit.lua b/source_edit.lua
index 9d37466..40af2e8 100644
--- a/source_edit.lua
+++ b/source_edit.lua
@@ -384,7 +384,6 @@ function edit.text_input(State, t)
   else
     local drawing_index, drawing = Drawing.current_drawing(State)
     if drawing_index == nil then
-      for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
       Text.text_input(State, t)
     end
   end
@@ -442,7 +441,6 @@ function edit.keychord_press(State, chord, key)
     Text.redraw_all(State)
   -- undo
   elseif chord == 'C-z' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     local event = undo_event(State)
     if event then
       local src = event.before
@@ -458,7 +456,6 @@ function edit.keychord_press(State, chord, key)
       schedule_save(State)
     end
   elseif chord == 'C-y' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     local event = redo_event(State)
     if event then
       local src = event.after
@@ -482,14 +479,12 @@ function edit.keychord_press(State, chord, key)
       App.set_clipboard(s)
     end
   elseif chord == 'C-x' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     local s = Text.cut_selection(State, State.left, State.right)
     if s then
       App.set_clipboard(s)
     end
     schedule_save(State)
   elseif chord == 'C-v' then
-    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
     -- We don't have a good sense of when to scroll, so we'll be conservative
     -- and sometimes scroll when we didn't quite need to.
     local before_line = State.cursor1.line