akkartik/pong.love - Change 34GRGWSUJ54C2XGR4SKQYUNDUIWIEWZK6VY2HSHFPPEQEZEW4XHAC

resolve conflicts

Created by akkartik on October 30, 2024

34GRGWSUJ54C2XGR4SKQYUNDUIWIEWZK6VY2HSHFPPEQEZEW4XHAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in source_edit.lua at line 153 [7.152503]
∅:∅[4.656] → [5.18427:18438]
∅:∅[8.734] → [5.18427:18438]
∅:∅[9.1823] → [5.18427:18438]
B:B[4.656] → [5.18427:18438]
B:B[8.734] → [5.18427:18438]
B:B[5.18427] → [5.18427:18438]
BD:B[9.1823] → [5.18427:18438]
```
  end
end
```
Deletion in source_edit.lua at line 276 [7.152503]
B:BD[9.2018] → [3.12:38]
BD:BD[9.2018] → [3.12:38]
```
        Text.right(State)
```

Replacement in source_edit.lua at line 414 [7.152503]

B:BD[6.218] → [6.218:295]

        edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)

[6.218]

[6.295]

        Text.right(State)

Deletion in edit.lua at line 100 [11.413]

B:BD[10.142371] → [2.127:127]

BD:BD[10.142371] → [2.127:127]

∅:D[2.127] → [12.126:200]

B:BD[9.2160] → [12.126:200]

BD:BD[9.2160] → [12.126:200]

∅:D[12.200] → [9.2239:2722]

B:BD[9.2239] → [9.2239:2722]

D:D[12.200] → [9.2239:2722]

BD:BD[12.200] → [9.2239:2722]

BD:BD[9.2239] → [9.2239:2722]

∅:D[12.270] → [9.2796:2802]

B:BD[9.2796] → [9.2796:2802]

D:D[12.270] → [9.2796:2802]

BD:BD[12.270] → [9.2796:2802]

BD:BD[9.2796] → [9.2796:2802]

B:BD[9.2802] → [6.355:360]

BD:BD[9.2802] → [6.355:360]

function edit.put_cursor_on_next_line_wrapping_around_if_necessary(State)
  local line = State.cursor1.line
  local max = #State.lines
  for _ = 1, max-1 do
    line = (line+1) % max
    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_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
  end
end