akkartik/pensieve.love - Change GC2EXJUFGAKWF2KWW6LF7OB2FAFGTBJPHFH667AAR35MP2GFQA2AC

resolve conflicts

Created by akkartik on October 29, 2024

GC2EXJUFGAKWF2KWW6LF7OB2FAFGTBJPHFH667AAR35MP2GFQA2AC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 1374 [6.178044]

B:BD[5.49034] → [3.223:299]

        edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(pane)

[5.49034]

[5.49080]

        Text.right(pane)

Deletion in edit.lua at line 149 [8.413]

B:BD[7.2150] → [7.2150:2255]

BD:BD[7.2150] → [7.2150:2255]

B:BD[7.2255] → [2.34:54]

BD:BD[7.2255] → [2.34:54]

∅:D[2.54] → [7.2256:2455]

B:BD[9.315] → [7.2256:2455]

BD:BD[9.315] → [7.2256:2455]

    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
      break
    end
  end
end
function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
  local line = State.cursor1.line
  local max = #State.lines
  for _ = 1, max-1 do
    line = (line+1) % max

Resurrecting zombie bytes in edit.lua at line 149 [8.413]

B:B[7.2455] → [7.2455:2560]

BD:B[7.2455] → [7.2455:2560]

B:B[7.2560] → [2.55:75]

BD:B[7.2560] → [2.55:75]

B:B[7.2889] → [2.76:259]

BD:B[7.2889] → [2.76:259]

    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
      break
    end
  end
end
function edit.final_cursor(State)
  for i=#State.lines,1,-1 do
    if State.lines[i].mode == 'text' then
      return {line=i, pos=utf8.len(State.lines[i].data)+1}
    end

Deletion in edit.lua at line 154 [8.413]

∅:D[2.75] → [7.2561:2889]

B:BD[9.394] → [7.2561:2889]

BD:BD[9.394] → [7.2561:2889]

  end
end
function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
  local cursor_line = State.lines[State.cursor1.line].data
  if State.cursor1.pos <= utf8.len(cursor_line) then
    State.cursor1.pos = State.cursor1.pos + 1
  else
    edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)