akkartik/pong.love - Change HGKCNQC5DCYQ5JFQEEBQVHHMWFOVU2BHS3UZHE5JND5IJUGLC22QC

resolve conflicts

Created by akkartik on May 6, 2025

HGKCNQC5DCYQ5JFQEEBQVHHMWFOVU2BHS3UZHE5JND5IJUGLC22QC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[6.2] → [7.177715:177749]

BFD:BFD[7.177749] → [7.165829:165829]

B:BD[7.166800] → [5.592:640]

B:BD[7.171278] → [5.641:669]

B:BD[7.174633] → [5.670:736]

B:BD[9.2826] → [5.737:810]

B:BD[7.175054] → [5.811:884]

B:BD[7.175324] → [5.885:970]

B:BD[7.175517] → [5.971:1039]

B:BD[7.175667] → [5.1040:1122]

B:BD[7.175738] → [5.1123:1217]

B:BD[7.176070] → [5.1218:1282]

B:BD[7.177101] → [5.1283:1361]

B:BD[7.177167] → [5.1362:1452]

B:BD[7.177458] → [5.1453:1522]

∅:D[5.1522] → [7.177681:177687]

∅:D[5.1452] → [7.177238:177249]

∅:D[5.1361] → [7.177160:177167]

∅:D[5.1282] → [7.176115:176250]

∅:D[5.1217] → [7.175814:175825]

∅:D[5.1122] → [7.175731:175738]

∅:D[5.1039] → [7.175567:175667]

∅:D[5.970] → [7.175506:175517]

∅:D[5.884] → [7.175110:175316]

∅:D[5.810] → [9.2882:2899]

∅:D[5.736] → [7.174682:174756]

∅:D[5.669] → [7.171307:171997]

∅:D[5.640] → [10.517:537]

function source.initialize(arg, unfiltered_arg)
function source.resize(w,h)
function source.mouse_press(x,y, mouse_button, is_touch, presses)
    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
    log_browser.mouse_press(Log_browser_state, x,y, mouse_button, is_touch, presses)
function source.mouse_release(x,y, mouse_button, is_touch, presses)
    return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button, is_touch, presses)
function source.keychord_press(chord, key, scancode, is_repeat)
    return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
    return log_browser.keychord_press(Log_browser_state, chord, key, scancode, is_repeat)
    return log_browser.key_release(Log_browser_state, key, scancode)
  end
  end
end
  else
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print('source keychord')
  if Show_file_navigator then
  end
end
  else
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
  end
end
  elseif Show_log_browser_side and Log_browser_state.left <= x and x < Log_browser_state.right then
--?     print('click on log_browser side')
    if Focus ~= 'log_browser' then
      Focus = 'log_browser'
    return
  end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print(("Window resized to width: %d and height: %d."):format(w, h))
  App.screen.width, App.screen.height = w, h
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  if Show_log_browser_side then
    Editor_state.right = App.screen.width/2 - Margin_right
  else
    Editor_state.right = App.screen.width-Margin_right
  end
  Log_browser_state.left = App.screen.width/2 + Margin_right
  Log_browser_state.right = App.screen.width-Margin_right
  Editor_state.width = Editor_state.right-Editor_state.left
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
--?   print('end resize')
end
  log_new('source')

File deletion: run.lua, run.lua

BFD:BFD[6.2] → [7.183867:183898]

BFD:BFD[7.183898] → [7.178107:178107]

B:BD[7.178423] → [5.1527:1572]

B:BD[7.181211] → [5.1573:1598]

B:BD[11.314] → [5.1599:1662]

B:BD[12.164] → [5.1663:1741]

B:BD[7.183012] → [5.1742:1807]

B:BD[7.183133] → [5.1808:1888]

B:BD[7.183346] → [5.1889:1950]

B:BD[7.183462] → [5.1951:2027]

∅:D[5.2027] → [7.183519:183524]

∅:D[5.1950] → [7.183388:183462]

∅:D[5.1888] → [7.183195:183200]

∅:D[5.1807] → [7.183059:183133]

∅:D[5.1741] → [7.183007:183012]

∅:D[5.1662] → [7.182872:182946]

∅:D[5.1598] → [7.181237:181676]

∅:D[5.1572] → [10.718:735]

function run.initialize(arg, unfiltered_arg)
function run.resize(w,h)
function run.mouse_press(x,y, mouse_button, is_touch, presses)
  return edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)
function run.mouse_release(x,y, mouse_button, is_touch, presses)
  return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)
function run.keychord_press(chord, key, scancode, is_repeat)
  return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
end
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
--?   print(("Window resized to width: %d and height: %d."):format(w, h))
  App.screen.width, App.screen.height = w, h
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  Editor_state.right = App.screen.width-Margin_right
  Editor_state.width = Editor_state.right-Editor_state.left
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
end
  log_new('run')

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[6.2] → [7.202684:202723]

BFD:BFD[7.202723] → [7.191243:191243]

B:BD[7.198624] → [5.2743:2821]

B:BD[7.200825] → [5.2822:2902]

B:BD[7.200938] → [5.2903:2979]

∅:D[5.2979] → [7.200995:201029]

∅:D[5.2902] → [14.1211:1447]

∅:D[5.2821] → [7.198685:200109]

function log_browser.mouse_press(State, x,y, mouse_button, is_touch, presses)
function log_browser.mouse_release(State, x,y, mouse_button, is_touch, presses)
function log_browser.keychord_press(State, chord, key, scancode, is_repeat)
  -- move
  if chord == 'up' then
end
function log_browser.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    for i=1,math.floor(dy) do
      log_browser.up(State)
    end
  elseif dy < 0 then
    for i=1,math.floor(-dy) do
      log_browser.down(State)
    end
  end
  local line_index = log_browser.line_index(State, x,y)
  if line_index == nil then
    -- below lower margin
    return
  end
  -- leave some space to click without focusing
  local line = State.lines[line_index]
  local xleft = log_browser.left_margin(State, line)
  local xright = log_browser.right_margin(State, line)
  if x < xleft or x > xright then
    return
  end
  -- if it's a section begin/end and the section is collapsed, expand it
  -- TODO: how to collapse?
  if line.section_begin or line.section_end then
    -- HACK: get section reference from next/previous line
    local new_section
    if line.section_begin then
      if line_index < #State.lines then
        local next_section_stack = State.lines[line_index+1].section_stack
        if next_section_stack then
          new_section = next_section_stack[#next_section_stack]
        end
      end
    elseif line.section_end then
      if line_index > 1 then
        local previous_section_stack = State.lines[line_index-1].section_stack
        if previous_section_stack then
          new_section = previous_section_stack[#previous_section_stack]
        end
      end
    end
    if new_section and new_section.expanded == nil then
      new_section.expanded = true
      return
    end
  end
  -- open appropriate file in source side
  if line.filename ~= Editor_state.filename then
    source.switch_to_file(line.filename)
  end
  -- set cursor

Replacement in text.lua at line 150 [16.1]

B:BD[15.85754] → [15.85754:85797]

function Text.keychord_press(State, chord)

[15.85754]

[15.85797]

function Text.keychord_press(State, chord, key, scancode, is_repeat)

Deletion in text.lua at line 992 [16.1]
B:BD[15.115541] → [3.102:102]
B:BD[17.1137] → [18.0:69]
BD:BD[17.1137] → [18.0:69]
BD:BD[17.1137] → [18.0:69]
BD:BD[17.1137] → [18.0:69]
```
function Text.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in text.lua at line 992 [16.1]
[15.115541]
[22.790]

Replacement in source_text.lua at line 226 [7.83786]

B:BD[20.5422] → [20.5422:5465]

function Text.keychord_press(State, chord)

[20.5422]

[23.16851]

function Text.keychord_press(State, chord, key, scancode, is_repeat)

Deletion in source_text.lua at line 1173 [7.83786]
B:BD[24.21703] → [25.164:164]
B:BD[26.5515] → [5.8:77]
BD:BD[26.5515] → [5.8:77]
BD:BD[26.5515] → [5.8:77]
```
function Text.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in source_text.lua at line 1173 [7.83786]
[24.21703]
Deletion in source_edit.lua at line 235 [7.152503]
B:BD[19.148629] → [27.7517:7517]
BD:BD[19.148629] → [27.7517:7517]
∅:D[20.5473] → [26.5563:5615]
∅:D[27.7517] → [26.5563:5615]
B:BD[7.157121] → [26.5563:5615]
BD:BD[7.157121] → [26.5563:5615]
```
function edit.mouse_press(State, x,y, mouse_button)
```
Resurrecting zombie bytes in source_edit.lua at line 235 [7.152503]
∅:∅[28.85] → [27.7518:7557]
B:B[26.5615] → [27.7518:7557]
BD:B[26.5615] → [27.7518:7557]
```
  if State.search_term then return end
```

Insertion in source_edit.lua at line 235 [7.152503]

[19.148629]

[27.7518]

function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)

Deletion in source_edit.lua at line 275 [7.152503]
B:BD[27.8645] → [30.11423:11423]
B:BD[7.157121] → [5.82:153]
BD:BD[7.157121] → [5.82:153]
B:BD[32.20742] → [5.154:239]
BD:BD[32.20742] → [5.154:239]
```
function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)
        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)
```
Resurrecting zombie bytes in source_edit.lua at line 275 [7.152503]
∅:∅[33.48] → [34.4943:4958]
∅:∅[35.141] → [34.4943:4958]
∅:∅[5.239] → [34.4943:4958]
∅:∅[36.9002] → [34.4943:4958]
∅:∅[30.11423] → [34.4943:4958]
B:B[26.5749] → [34.4943:4958]
BD:B[26.5749] → [34.4943:4958]
```
        return
```
Solving an order conflict in source_edit.lua at line 275 [7.152503]
[27.8645]
[34.4943]
Deletion in source_edit.lua at line 276 [7.152503]
B:BD[7.157761] → [5.240:313]
BD:BD[7.157761] → [5.240:313]
BD:BD[7.157761] → [5.240:313]
B:BD[32.20935] → [5.314:385]
BD:BD[32.20935] → [5.314:385]
```
function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)
    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
```

Replacement in source_edit.lua at line 282 [7.152503]

B:BD[27.9061] → [27.9061:9127]

        Drawing.mouse_press(State, line_index, x,y, mouse_button)

[27.9061]

[36.9003]

        Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)

Replacement in source_edit.lua at line 295 [7.152503]

B:BD[27.9161] → [27.9161:9215]

function edit.mouse_release(State, x,y, mouse_button)

[27.9161]

[27.9215]

function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in source_edit.lua at line 300 [7.152503]

B:BD[27.9315] → [27.9315:9367]

    Drawing.mouse_release(State, x,y, mouse_button)

[27.9315]

[27.9392]

    Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in source_edit.lua at line 386 [7.152503]

B:BD[27.11321] → [27.11321:11369]

function edit.keychord_press(State, chord, key)

[27.11321]

[27.11369]

function edit.keychord_press(State, chord, key, scancode, is_repeat)

Resurrecting zombie bytes in source_edit.lua at line 506 [7.152503]

∅:∅[5.525] → [32.22084:22390]

∅:∅[26.6019] → [32.22084:22390]

B:B[32.22084] → [32.22084:22390]

BD:B[26.6019] → [32.22084:22390]

      record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})
      schedule_save(State)
    end
  elseif chord == 'escape' and not App.mouse_down(1) then
    for _,line in ipairs(State.lines) do
      if line.mode == 'drawing' then
        line.show_help = false
      end
    end

Resurrecting zombie bytes in source_edit.lua at line 516 [7.152503]

∅:∅[38.678] → [32.22441:23003]

B:B[32.22441] → [32.22441:23003]

BD:B[32.22441] → [32.22441:23003]

    if chord == 'return' then
      State.current_drawing_mode = State.previous_drawing_mode
      State.previous_drawing_mode = nil
    else
      local before = snapshot(State, State.lines.current_drawing_index)
      local drawing = State.lines.current_drawing
      local p = drawing.points[drawing.pending.target_point]
      if chord == 'escape' then
        p.name = nil
        record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
      elseif chord == 'backspace' then
        local len = utf8.len(p.name)

Resurrecting zombie bytes in source_edit.lua at line 534 [7.152503]
∅:∅[38.983] → [32.23263:23306]
B:B[32.23263] → [32.23263:23306]
BD:B[32.23263] → [32.23263:23306]
```
      end
    end
    schedule_save(State)
```
Deletion in source_edit.lua at line 537 [7.152503]
B:BD[7.158159] → [5.386:455]
BD:BD[7.158159] → [5.386:455]
BD:BD[7.158159] → [5.386:455]
```
function edit.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in source_edit.lua at line 537 [7.152503]
[32.23306]
[30.11859]

Replacement in source_edit.lua at line 538 [7.152503]

B:BD[19.154445] → [20.5638:5676]

    Text.keychord_press(State, chord)

[19.154338]

[19.154485]

    Text.keychord_press(State, chord, key, scancode, is_repeat)

Deletion in source_edit.lua at line 615 [7.152503]
B:BD[19.156934] → [30.11881:11881]
B:BD[7.163191] → [5.526:590]
BD:BD[7.163191] → [5.526:590]
```
    Text.keychord_press(State, chord, key, scancode, is_repeat)
```
Solving an order conflict in source_edit.lua at line 615 [7.152503]
[19.156934]
Replacement in source.lua at line 54 [39.5]
B:BD[39.480] → [40.5:34]
```
function source.initialize()
```
[39.480]
[41.390]
```
function source.initialize(arg, unfiltered_arg)
```
Replacement in source.lua at line 171 [39.5]
B:BD[39.5407] → [39.5407:5436]
```
function source.resize(w, h)
```
[39.5407]
[39.5436]
```
function source.resize(w,h)
```

Replacement in source.lua at line 281 [39.5]

B:BD[39.8357] → [20.6286:6333]

function source.mouse_press(x,y, mouse_button)

[39.8357]

[39.8406]

function source.mouse_press(x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 289 [39.5]

B:BD[42.1787] → [20.6334:6388]

    edit.mouse_press(Editor_state, x,y, mouse_button)

[42.1787]

[42.1843]

    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 298 [39.5]

B:BD[39.8879] → [20.6389:6443]

    edit.mouse_press(Editor_state, x,y, mouse_button)

[39.8879]

[43.242]

    edit.mouse_press(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 305 [39.5]

B:BD[39.9174] → [20.6444:6510]

    log_browser.mouse_press(Log_browser_state, x,y, mouse_button)

[39.9174]

    log_browser.mouse_press(Log_browser_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 309 [39.5]

B:BD[39.9185] → [20.6511:6560]

function source.mouse_release(x,y, mouse_button)

[39.9185]

[39.9235]

function source.mouse_release(x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 312 [39.5]

B:BD[44.704] → [20.6561:6624]

    return edit.mouse_release(Editor_state, x,y, mouse_button)

[44.704]

[39.9404]

    return edit.mouse_release(Editor_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 314 [39.5]

B:BD[39.9411] → [20.6625:6700]

    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button)

[39.9411]

[39.9487]

    return log_browser.mouse_release(Log_browser_state, x,y, mouse_button, is_touch, presses)

Replacement in source.lua at line 340 [39.5]

B:BD[39.9748] → [20.6871:6914]

function source.keychord_press(chord, key)

[39.9748]

[39.9793]

function source.keychord_press(chord, key, scancode, is_repeat)

Replacement in source.lua at line 379 [39.5]

B:BD[44.758] → [20.6965:7022]

    return edit.keychord_press(Editor_state, chord, key)

[44.758]

[39.9957]

    return edit.keychord_press(Editor_state, chord, key, scancode, is_repeat)

Replacement in source.lua at line 381 [39.5]

B:BD[39.9964] → [20.7023:7092]

    return log_browser.keychord_press(Log_browser_state, chord, key)

[39.9964]

[39.10035]

    return log_browser.keychord_press(Log_browser_state, chord, key, scancode, is_repeat)

Replacement in source.lua at line 390 [39.5]

B:BD[39.10260] → [20.7195:7272]

    return log_browser.keychord_press(Log_browser_state, chordkey, scancode)

[39.10260]

[39.10483]

    return log_browser.key_release(Log_browser_state, key, scancode)

Replacement in pong.lua at line 8 [39.10555]
B:BD[39.10643] → [39.10643:10673]
```
function pong.initialize(arg)
```
[39.10643]
[27.13490]
```
function pong.initialize(arg, unfiltered_arg)
```

Replacement in pong.lua at line 78 [39.10555]

B:BD[39.11825] → [20.7276:7317]

function pong.keychord_press(chord, key)

[39.11825]

[39.11861]

function pong.keychord_press(chord, key, scancode, is_repeat)

Replacement in main.lua at line 108 [46.2]
B:BD[45.1016] → [8.93:122]
```
function App.initialize(arg)
```
[45.1016]
[47.463]
```
function App.initialize(arg, unfiltered_arg)
```
Deletion in main.lua at line 112 [46.2]
B:BD[45.1016] → [18.2011:2056]
BD:BD[45.1016] → [18.2011:2056]
B:BD[49.187174] → [18.2057:2097]
BD:BD[49.187174] → [18.2057:2097]
B:BD[49.187236] → [18.2098:2141]
BD:BD[49.187236] → [18.2098:2141]
BD:BD[49.187236] → [18.2098:2141]
```
function App.initialize(arg, unfiltered_arg)
    run.initialize(arg, unfiltered_arg)
    source.initialize(arg, unfiltered_arg)
```
Solving an order conflict in main.lua at line 112 [46.2]
[47.541]
[50.673]
Replacement in main.lua at line 114 [46.2]
B:BD[47.574] → [47.574:596]
```
    pong.initialize()
```
[47.574]
[47.596]
```
    pong.initialize(arg, unfiltered_arg)
```
Replacement in main.lua at line 116 [46.2]
B:BD[47.634] → [47.634:658]
```
    source.initialize()
```
[47.634]
[47.658]
```
    source.initialize(arg, unfiltered_arg)
```
Deletion in main.lua at line 244 [46.2]
B:BD[39.14410] → [20.7405:7405]
B:BD[20.7405] → [20.7406:7474]
B:BD[49.189628] → [18.2204:2291]
BD:BD[49.189628] → [18.2204:2291]
```
    if pong.keychord_press then pong.keychord_press(chord, key) end
    if run.keychord_press then run.keychord_press(chord, key, scancode, is_repeat) end
```
Solving an order conflict in main.lua at line 244 [46.2]
[39.14410]

Insertion in main.lua at line 244 [46.2]

[0.1784]

[49.189698]

    if pong.keychord_press then pong.keychord_press(chord, key, scancode, is_repeat) end

Deletion in main.lua at line 281 [46.2]
B:BD[51.213] → [47.1690:1690]
B:BD[51.213] → [5.2094:2094]
Replacement in main.lua at line 286 [46.2]
B:BD[52.361] → [47.1692:1692]
∅:D[47.1692] → [39.15328:15373]
B:BD[52.361] → [39.15328:15373]
```
function App.mousepressed(x,y, mouse_button)
```
[52.361]
[47.1693]
```
function App.mousepressed(x,y, mouse_button, is_touch, presses)
```

Replacement in main.lua at line 290 [46.2]

B:BD[39.15405] → [20.7648:7717]

    if pong.mouse_press then pong.mouse_press(x,y, mouse_button) end

[39.15405]

[39.15478]

    if pong.mouse_press then pong.mouse_press(x,y, mouse_button, is_touch, presses) end

Replacement in main.lua at line 292 [46.2]

B:BD[39.15516] → [20.7718:7791]

    if source.mouse_press then source.mouse_press(x,y, mouse_button) end

[39.15516]

[53.206]

    if source.mouse_press then source.mouse_press(x,y, mouse_button, is_touch, presses) end

Replacement in main.lua at line 298 [46.2]

B:BD[53.277] → [4.19:65]

function App.mousereleased(x,y, mouse_button)

[53.277]

[47.1740]

function App.mousereleased(x,y, mouse_button, is_touch, presses)

Replacement in main.lua at line 301 [46.2]

B:BD[53.354] → [53.354:427]

    if pong.mouse_release then pong.mouse_release(x,y, mouse_button) end

[53.354]

[53.427]

    if pong.mouse_release then pong.mouse_release(x,y, mouse_button, is_touch, presses) end

Replacement in main.lua at line 303 [46.2]

B:BD[53.465] → [53.465:542]

    if source.mouse_release then source.mouse_release(x,y, mouse_button) end

[53.465]

[54.19]

    if source.mouse_release then source.mouse_release(x,y, mouse_button, is_touch, presses) end

Replacement in main.lua at line 312 [46.2]

B:BD[2.51] → [2.51:106]

    if pong.mouse_move then pong.mouse_move(dx,dy) end

[2.51]

[54.266]

    if pong.mouse_move then pong.mouse_move(x,y, dx,dy, is_touch) end

Replacement in main.lua at line 314 [46.2]

B:BD[54.304] → [54.304:363]

    if source.mouse_move then source.mouse_move(dx,dy) end

[54.304]

[53.542]

    if source.mouse_move then source.mouse_move(x,y, dx,dy, is_touch) end

Deletion in main.lua at line 325 [46.2]
B:BD[55.146] → [54.365:365]
B:BD[52.361] → [5.2095:2159]
BD:BD[52.361] → [5.2095:2159]
∅:D[5.2159] → [56.1272:1318]
B:BD[7.190074] → [56.1272:1318]
BD:BD[7.190074] → [56.1272:1318]
B:BD[7.190137] → [5.2160:2246]
BD:BD[7.190137] → [5.2160:2246]
B:BD[7.190246] → [5.2248:2248]
BD:BD[7.190246] → [5.2248:2248]
B:BD[5.2248] → [5.2249:2341]
BD:BD[5.2248] → [5.2249:2341]
BD:BD[5.2248] → [5.2249:2341]
B:BD[57.143] → [5.2408:2498]
BD:BD[57.143] → [5.2408:2498]
∅:D[5.2407] → [58.21:21]
BD:BD[14.889] → [58.21:21]
B:BD[59.894] → [5.2342:2407]
BD:BD[59.894] → [5.2342:2407]
BD:BD[59.894] → [5.2342:2407]
B:BD[59.893] → [59.893:894]
BD:BD[59.893] → [59.893:894]
∅:D[14.842] → [59.823:893]
∅:D[61.946] → [59.823:893]
∅:D[5.2341] → [59.823:893]
∅:D[18.2884] → [59.823:893]
B:BD[17.5101] → [59.823:893]
D:D[14.842] → [59.823:893]
D:D[14.842] → [59.823:893]
BD:BD[17.5101] → [59.823:893]
B:BD[59.1059] → [5.2665:2739]
BD:BD[59.1059] → [5.2665:2739]
BD:BD[59.1059] → [5.2665:2739]
∅:D[58.272] → [59.1021:1059]
∅:D[14.961] → [59.1021:1059]
∅:D[5.2664] → [59.1021:1059]
B:BD[59.1021] → [59.1021:1059]
D:D[58.272] → [59.1021:1059]
D:D[53.710] → [59.1021:1059]
D:D[14.961] → [59.1021:1059]
D:D[14.961] → [59.1021:1059]
D:D[59.1021] → [59.1021:1059]
BD:BD[59.1021] → [59.1021:1059]
B:BD[59.956] → [5.2596:2664]
BD:BD[59.956] → [5.2596:2664]
∅:D[14.889] → [59.925:956]
∅:D[62.1144] → [59.925:956]
∅:D[63.1404] → [59.925:956]
B:BD[59.925] → [59.925:956]
D:D[53.644] → [59.925:956]
D:D[14.889] → [59.925:956]
D:D[14.889] → [59.925:956]
D:D[59.925] → [59.925:956]
D:D[62.1144] → [59.925:956]
D:D[63.1404] → [59.925:956]
BD:BD[59.925] → [59.925:956]
∅:D[58.171] → [57.293:364]
∅:D[5.2595] → [57.293:364]
∅:D[18.3028] → [57.293:364]
B:BD[57.293] → [57.293:364]
D:D[58.171] → [57.293:364]
BD:BD[57.293] → [57.293:364]
B:BD[57.234] → [5.2499:2595]
BD:BD[57.234] → [5.2499:2595]
∅:D[58.93] → [57.196:234]
∅:D[5.2498] → [57.196:234]
∅:D[18.2953] → [57.196:234]
B:BD[57.196] → [57.196:234]
D:D[58.93] → [57.196:234]
BD:BD[57.196] → [57.196:234]
```
function App.mousepressed(x,y, mouse_button, is_touch, presses)
  if current_app_is_warning() then return end
    if run.mouse_press then run.mouse_press(x,y, mouse_button, is_touch, presses) end
    if source.mouse_press then source.mouse_press(x,y, mouse_button, is_touch, presses) end
    if run.mouse_release then run.mouse_release(x,y, mouse_button, is_touch, presses) end
function App.mousereleased(x,y, mouse_button, is_touch, presses)
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
    if source.mouse_move then source.mouse_move(x,y, dx,dy, is_touch) end
  elseif Current_app == 'source' then
    if run.mouse_move then run.mouse_move(x,y, dx,dy, is_touch) end
  if Current_app == 'run' then
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
    if source.mouse_release then source.mouse_release(x,y, mouse_button, is_touch, presses) end
  elseif Current_app == 'source' then
```
Solving an order conflict in main.lua at line 325 [46.2]
[55.146]
[53.711]
Deletion in main.lua at line 358 [46.2]
B:BD[53.1299] → [53.1299:1309]
B:BD[53.1309] → [54.710:710]
```
  end
end
```
Resurrecting zombie bytes in main.lua at line 358 [46.2]
B:B[58.334] → [58.335:346]
BD:B[58.334] → [58.335:346]
BD:B[58.334] → [58.335:346]
```
  end
end
```
Solving an order conflict in main.lua at line 358 [46.2]
[53.1299]
[58.334]
Deletion in main.lua at line 361 [46.2]
∅:D[54.710] → [62.1196:1197]
∅:D[47.1950] → [62.1196:1197]
∅:D[13.14869] → [62.1196:1197]
B:BD[62.1196] → [62.1196:1197]

Replacement in log_browser.lua at line 186 [65.5]

B:BD[64.191] → [20.7995:8054]

function log_browser.mouse_press(State, x,y, mouse_button)

[64.191]

[39.17724]

function log_browser.mouse_press(State, x,y, mouse_button, is_touch, presses)

Replacement in log_browser.lua at line 252 [65.5]

B:BD[66.1241] → [20.8055:8116]

function log_browser.mouse_release(State, x,y, mouse_button)

[66.1241]

[60.980]

function log_browser.mouse_release(State, x,y, mouse_button, is_touch, presses)

Replacement in log_browser.lua at line 270 [65.5]

B:BD[64.365] → [20.8160:8215]

function log_browser.keychord_press(State, chord, key)

[64.365]

[67.152]

function log_browser.keychord_press(State, chord, key, scancode, is_repeat)

Deletion in edit.lua at line 148 [70.413]
B:BD[68.1770] → [68.1770:1822]
BD:BD[68.1770] → [68.1770:1822]
```
function edit.mouse_press(State, x,y, mouse_button)
```
Resurrecting zombie bytes in edit.lua at line 149 [70.413]
∅:∅[71.176] → [68.1822:1861]
∅:∅[5.3059] → [68.1822:1861]
B:B[71.176] → [68.1822:1861]
B:B[68.1822] → [68.1822:1861]
BD:B[68.1822] → [68.1822:1861]
```
  if State.search_term then return end
```

Resurrecting zombie bytes in edit.lua at line 151 [70.413]

∅:∅[72.63] → [68.1861:3203]

B:B[68.1861] → [68.1861:3203]

BD:B[68.1861] → [68.1861:3203]

--?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
  if y < State.top then
    State.old_cursor1 = State.cursor1
    State.old_selection1 = State.selection1
    State.mousepress_shift = App.shift_down()
    State.selection1 = {
        line=State.screen_top1.line,
        pos=State.screen_top1.pos,
    }
    return
  end
  for line_index,line in ipairs(State.lines) do
    if Text.in_line(State, line_index, x,y) then
      -- delicate dance between cursor, selection and old cursor/selection
      -- scenarios:
      --  regular press+release: sets cursor, clears selection
      --  shift press+release:
      --    sets selection to old cursor if not set otherwise leaves it untouched
      --    sets cursor
      --  press and hold to start a selection: sets selection on press, cursor on release
      --  press and hold, then press shift: ignore shift
      --    i.e. mouse_release should never look at shift state
--?       print_and_log(('edit.mouse_press: in line %d'):format(line_index))
      State.old_cursor1 = State.cursor1
      State.old_selection1 = State.selection1
      State.mousepress_shift = App.shift_down()
      State.selection1 = {
          line=line_index,
          pos=Text.to_pos_on_line(State, line_index, x, y),
      }
      return
    end
  end

Resurrecting zombie bytes in edit.lua at line 187 [70.413]
∅:∅[73.1928] → [68.3252:3374]
B:B[68.3252] → [68.3252:3374]
BD:B[68.3252] → [68.3252:3374]
```
  State.old_cursor1 = State.cursor1
  State.old_selection1 = State.selection1
  State.mousepress_shift = App.shift_down()
```
Resurrecting zombie bytes in edit.lua at line 191 [70.413]
∅:∅[74.324] → [68.3510:3515]
∅:∅[75.9019] → [68.3510:3515]
B:B[68.3510] → [68.3510:3515]
B:B[75.9019] → [68.3510:3515]
BD:B[68.3510] → [68.3510:3515]
```
end
```
Deletion in edit.lua at line 193 [70.413]
B:BD[68.3515] → [68.3515:3569]
BD:BD[68.3515] → [68.3515:3569]
```
function edit.mouse_release(State, x,y, mouse_button)
```

Resurrecting zombie bytes in edit.lua at line 194 [70.413]

∅:∅[5.3133] → [68.3569:3727]

B:B[68.3569] → [68.3569:3727]

BD:B[68.3569] → [68.3569:3727]

  if State.search_term then return end
--?   print_and_log(('edit.mouse_release(%d,%d): cursor at %d,%d'):format(x,y, State.cursor1.line, State.cursor1.pos))

Resurrecting zombie bytes in edit.lua at line 202 [70.413]

∅:∅[73.2084] → [68.3727:4134]

B:B[68.3727] → [68.3727:4134]

BD:B[68.3727] → [68.3727:4134]

  for line_index,line in ipairs(State.lines) do
    if Text.in_line(State, line_index, x,y) then
--?       print_and_log(('edit.mouse_release: in line %d'):format(line_index))
      State.cursor1 = {
          line=line_index,
          pos=Text.to_pos_on_line(State, line_index, x, y),
      }
--?       print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Resurrecting zombie bytes in edit.lua at line 212 [70.413]
∅:∅[73.2137] → [68.4530:4544]
B:B[68.4530] → [68.4530:4544]
BD:B[68.4530] → [68.4530:4544]
```
    end
  end
```

Resurrecting zombie bytes in edit.lua at line 218 [70.413]

∅:∅[73.2360] → [68.4544:4742]

B:B[68.4544] → [68.4544:4742]

BD:B[68.4544] → [68.4544:4742]

--?   print_and_log(('edit.mouse_release: finally selection %s,%s cursor %d,%d'):format(tostring(State.selection1.line), tostring(State.selection1.pos), State.cursor1.line, State.cursor1.pos))
end

Resurrecting zombie bytes in edit.lua at line 235 [70.413]
∅:∅[73.2748] → [68.4742:4804]
B:B[68.4742] → [68.4742:4804]
BD:B[68.4742] → [68.4742:4804]
```
function edit.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
```
Resurrecting zombie bytes in edit.lua at line 238 [70.413]
∅:∅[76.918] → [68.4881:4961]
B:B[68.4881] → [68.4881:4961]
BD:B[68.4881] → [68.4881:4961]
```
    for i=1,math.floor(dy) do
      Text.up(State)
    end
  elseif dy < 0 then
```

Resurrecting zombie bytes in edit.lua at line 243 [70.413]

∅:∅[75.9168] → [68.5044:5289]

B:B[68.5044] → [68.5044:5289]

B:B[75.9168] → [68.5044:5289]

BD:B[68.5044] → [68.5044:5289]

B:B[68.5396] → [68.5396:5460]

BD:B[68.5396] → [68.5396:5460]

    for i=1,math.floor(-dy) do
      Text.down(State)
    end
  end
end
function edit.text_input(State, t)
--?   print('text input', t)
  if State.search_term then
    State.search_term = State.search_term..t
    Text.search_next(State)
  else
    Text.text_input(State, t)
  end
  schedule_save(State)
end

Deletion in edit.lua at line 260 [70.413]
B:BD[68.5460] → [68.5460:5508]
BD:BD[68.5460] → [68.5460:5508]
```
function edit.keychord_press(State, chord, key)
```

Resurrecting zombie bytes in edit.lua at line 261 [70.413]

∅:∅[5.3203] → [68.5508:5769]

B:B[68.5508] → [68.5508:5769]

BD:B[68.5508] → [68.5508:5769]

  if State.selection1.line and
      -- printable character created using shift key => delete selection
      -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
      (not App.shift_down() or utf8.len(key) == 1) and

Resurrecting zombie bytes in edit.lua at line 267 [70.413]

∅:∅[77.364] → [68.6014:6048]

B:B[68.6014] → [68.6014:6048]

BD:B[68.6014] → [68.6014:6048]

B:B[68.6155] → [68.6155:6353]

BD:B[68.6155] → [68.6155:6353]

  end
  if State.search_term then
    if chord == 'escape' then
      State.search_term = nil
      State.cursor1 = State.search_backup.cursor
      State.screen_top1 = State.search_backup.screen_top
      State.search_backup = nil

Resurrecting zombie bytes in edit.lua at line 275 [70.413]

∅:∅[78.1221] → [68.6450:6765]

B:B[68.6450] → [68.6450:6765]

BD:B[68.6450] → [68.6450:6765]

    elseif chord == 'return' then
      State.search_term = nil
      State.search_backup = nil
    elseif chord == 'backspace' then
      local len = utf8.len(State.search_term)
      local byte_offset = Text.offset(State.search_term, len)
      State.search_term = string.sub(State.search_term, 1, byte_offset-1)

Resurrecting zombie bytes in edit.lua at line 285 [70.413]
∅:∅[76.1073] → [68.6765:6797]
B:B[68.6765] → [68.6765:6797]
BD:B[68.6765] → [68.6765:6797]
```
    elseif chord == 'down' then
```

Resurrecting zombie bytes in edit.lua at line 290 [70.413]

∅:∅[79.2954] → [68.6873:7604]

B:B[68.6873] → [68.6873:7604]

BD:B[68.6873] → [68.6873:7604]

B:B[68.7711] → [68.7711:7991]

BD:B[68.7711] → [68.7711:7991]

    elseif chord == 'up' then
      Text.search_previous(State)
    end
    return
  elseif chord == 'C-f' then
    State.search_term = ''
    State.search_backup = {
      cursor={line=State.cursor1.line, pos=State.cursor1.pos},
      screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},
    }
  -- zoom
  elseif chord == 'C-=' then
    edit.update_font_settings(State, State.font_height+2)
    Text.redraw_all(State)
  elseif chord == 'C--' then
    if State.font_height > 2 then
      edit.update_font_settings(State, State.font_height-2)
      Text.redraw_all(State)
    end
  elseif chord == 'C-0' then
    edit.update_font_settings(State, 20)
    Text.redraw_all(State)
  -- undo
  elseif chord == 'C-z' then
    local event = undo_event(State)
    if event then
      local src = event.before
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.after, event.before)

Resurrecting zombie bytes in edit.lua at line 322 [70.413]

∅:∅[78.1321] → [68.8163:8227]

B:B[68.8163] → [68.8163:8227]

BD:B[68.8163] → [68.8163:8227]

B:B[68.8334] → [68.8334:8613]

BD:B[68.8334] → [68.8334:8613]

      schedule_save(State)
    end
  elseif chord == 'C-y' then
    local event = redo_event(State)
    if event then
      local src = event.after
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.before, event.after)

Resurrecting zombie bytes in edit.lua at line 333 [70.413]

∅:∅[78.1421] → [68.8715:9064]

B:B[68.8715] → [68.8715:9064]

BD:B[68.8715] → [68.8715:9064]

      schedule_save(State)
    end
  -- clipboard
  elseif chord == 'C-a' then
    State.selection1 = {line=1, pos=1}
    State.cursor1 = {line=#State.lines, pos=utf8.len(State.lines[#State.lines].data)+1}
  elseif chord == 'C-c' then
    local s = Text.selection(State)
    if s then
      App.set_clipboard(s)
    end
  elseif chord == 'C-x' then

Resurrecting zombie bytes in edit.lua at line 346 [70.413]

∅:∅[77.427] → [68.9236:9339]

B:B[68.9236] → [68.9236:9339]

BD:B[68.9236] → [68.9236:9339]

B:B[68.9446] → [68.9446:10055]

BD:B[68.9446] → [68.9446:10055]

B:B[68.10080] → [68.10080:10182]

BD:B[68.10080] → [68.10080:10182]

    if s then
      App.set_clipboard(s)
    end
    schedule_save(State)
  elseif chord == 'C-v' then
    -- 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
    local before = snapshot(State, before_line)
    local clipboard_data = App.get_clipboard()
    for _,code in utf8.codes(clipboard_data) do
      local c = utf8.char(code)
      if c == '\n' then
        Text.insert_return(State)
      else
        Text.insert_at_cursor(State, c)
      end
    end
    if Text.cursor_out_of_screen(State) then
      Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)
    end
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Resurrecting zombie bytes in edit.lua at line 369 [70.413]
∅:∅[80.536] → [68.10204:10211]
B:B[68.10204] → [68.10204:10211]
BD:B[68.10204] → [68.10204:10211]
```
  else
```
Deletion in edit.lua at line 370 [70.413]
B:BD[68.10318] → [68.10318:10356]
BD:BD[68.10318] → [68.10318:10356]
```
    Text.keychord_press(State, chord)
```
Resurrecting zombie bytes in edit.lua at line 371 [70.413]
∅:∅[5.3268] → [68.10356:10420]
B:B[68.10356] → [68.10356:10420]
BD:B[68.10356] → [68.10356:10420]
```
  end
end
function edit.key_release(State, key, scancode)
end
```
Resurrecting zombie bytes in edit.lua at line 378 [70.413]
∅:∅[81.90] → [68.10475:10509]
B:B[68.10475] → [68.10475:10509]
BD:B[68.10475] → [68.10475:10509]
```
  State.font_height = font_height
```

Resurrecting zombie bytes in edit.lua at line 380 [70.413]

∅:∅[81.155] → [68.10575:11061]

∅:∅[82.1696] → [68.10575:11061]

B:B[82.1696] → [68.10575:11061]

B:B[68.10575] → [68.10575:11061]

BD:B[68.10575] → [68.10575:11061]

  State.line_height = math.floor(font_height*1.3)
end
--== some methods for tests
-- Insulate tests from some key globals so I don't have to change the vast
-- majority of tests when they're modified for the real app.
Test_margin_left = 25
Test_margin_right = 0
function edit.initialize_test_state()
  -- if you change these values, tests will start failing
  return edit.initialize_state(
      15,  -- top margin
      Test_margin_left,
      App.screen.width - Test_margin_right,

Resurrecting zombie bytes in edit.lua at line 398 [70.413]

∅:∅[82.1738] → [68.11115:11471]

B:B[68.11115] → [68.11115:11471]

BD:B[68.11115] → [68.11115:11471]

      15)  -- line height
end
-- all text_input events are also keypresses
-- TODO: handle chords of multiple keys
function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
-- not all keys are text_input

Resurrecting zombie bytes in edit.lua at line 416 [70.413]

∅:∅[83.5245] → [68.11587:11811]

B:B[68.11587] → [68.11587:11811]

BD:B[68.11587] → [68.11587:11811]

  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_click(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)

Resurrecting zombie bytes in edit.lua at line 425 [70.413]

∅:∅[75.9188] → [68.11811:12430]

B:B[68.11811] → [68.11811:12430]

BD:B[68.11811] → [68.11811:12430]

  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_press(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_release(State, x,y, mouse_button)
  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end

resolve conflicts

Dependencies

In channels

Change contents

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

File deletion: log_browser.lua, log_browser.lua

Replacement in text.lua at line 150 [16.1]

Deletion in text.lua at line 992 [16.1]

Solving an order conflict in text.lua at line 992 [16.1]

Replacement in source_text.lua at line 226 [7.83786]

Deletion in source_text.lua at line 1173 [7.83786]

Solving an order conflict in source_text.lua at line 1173 [7.83786]

Deletion in source_edit.lua at line 235 [7.152503]

Resurrecting zombie bytes in source_edit.lua at line 235 [7.152503]

Insertion in source_edit.lua at line 235 [7.152503]

Deletion in source_edit.lua at line 275 [7.152503]

Resurrecting zombie bytes in source_edit.lua at line 275 [7.152503]

Solving an order conflict in source_edit.lua at line 275 [7.152503]

Deletion in source_edit.lua at line 276 [7.152503]

Replacement in source_edit.lua at line 282 [7.152503]

Replacement in source_edit.lua at line 295 [7.152503]

Replacement in source_edit.lua at line 300 [7.152503]

Replacement in source_edit.lua at line 386 [7.152503]

Resurrecting zombie bytes in source_edit.lua at line 506 [7.152503]

Resurrecting zombie bytes in source_edit.lua at line 516 [7.152503]

Resurrecting zombie bytes in source_edit.lua at line 534 [7.152503]

Deletion in source_edit.lua at line 537 [7.152503]

Solving an order conflict in source_edit.lua at line 537 [7.152503]

Replacement in source_edit.lua at line 538 [7.152503]

Deletion in source_edit.lua at line 615 [7.152503]

Solving an order conflict in source_edit.lua at line 615 [7.152503]

Replacement in source.lua at line 54 [39.5]

Replacement in source.lua at line 171 [39.5]

Replacement in source.lua at line 281 [39.5]

Replacement in source.lua at line 289 [39.5]

Replacement in source.lua at line 298 [39.5]

Replacement in source.lua at line 305 [39.5]

Replacement in source.lua at line 309 [39.5]

Replacement in source.lua at line 312 [39.5]

Replacement in source.lua at line 314 [39.5]

Replacement in source.lua at line 340 [39.5]

Replacement in source.lua at line 379 [39.5]

Replacement in source.lua at line 381 [39.5]

Replacement in source.lua at line 390 [39.5]

Replacement in pong.lua at line 8 [39.10555]

Replacement in pong.lua at line 78 [39.10555]

Replacement in main.lua at line 108 [46.2]

Deletion in main.lua at line 112 [46.2]

Solving an order conflict in main.lua at line 112 [46.2]

Replacement in main.lua at line 114 [46.2]

Replacement in main.lua at line 116 [46.2]

Deletion in main.lua at line 244 [46.2]

Solving an order conflict in main.lua at line 244 [46.2]

Insertion in main.lua at line 244 [46.2]

Deletion in main.lua at line 281 [46.2]

Replacement in main.lua at line 286 [46.2]

Replacement in main.lua at line 290 [46.2]

Replacement in main.lua at line 292 [46.2]

Replacement in main.lua at line 298 [46.2]

Replacement in main.lua at line 301 [46.2]

Replacement in main.lua at line 303 [46.2]

Replacement in main.lua at line 312 [46.2]

Replacement in main.lua at line 314 [46.2]

Deletion in main.lua at line 325 [46.2]

Solving an order conflict in main.lua at line 325 [46.2]

Deletion in main.lua at line 358 [46.2]

Resurrecting zombie bytes in main.lua at line 358 [46.2]

Solving an order conflict in main.lua at line 358 [46.2]

Deletion in main.lua at line 361 [46.2]

Replacement in log_browser.lua at line 186 [65.5]

Replacement in log_browser.lua at line 252 [65.5]

Replacement in log_browser.lua at line 270 [65.5]

Deletion in edit.lua at line 148 [70.413]

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

Resurrecting zombie bytes in edit.lua at line 151 [70.413]

Resurrecting zombie bytes in edit.lua at line 187 [70.413]

Resurrecting zombie bytes in edit.lua at line 191 [70.413]

Deletion in edit.lua at line 193 [70.413]

Resurrecting zombie bytes in edit.lua at line 194 [70.413]