akkartik/techmeet-capture.love - Change VOJISLDCFDI2USUKF3FCERHEI4C3SRLIMGSLRJUEH45VOAAUWFLAC

resolve conflicts

Created by akkartik on February 4, 2024

VOJISLDCFDI2USUKF3FCERHEI4C3SRLIMGSLRJUEH45VOAAUWFLAC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 399 [6.413]

B:BD[5.9142] → [5.9142:9329]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(chord) then

[5.9142]

[5.9329]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

Replacement in edit.lua at line 589 [6.413]

B:BD[5.16602] → [5.16602:16718]

function edit.run_after_keychord(State, chord)
  edit.keychord_press(State, chord)
  edit.key_release(State, chord)

[5.16602]

[5.16718]

function edit.run_after_keychord(State, chord, key)
  edit.keychord_press(State, chord, key)
  edit.key_release(State, key)

Deletion in edit.lua at line 622 [6.413]

B:BD[5.17561] → [2.330:330]

B:BD[6.10752] → [4.0:185]

BD:BD[6.10752] → [4.0:185]

B:BD[7.6020] → [3.9575:9699]

BD:BD[7.6020] → [3.9575:9699]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then
function edit.run_after_keychord(State, chord, key)
  edit.keychord_press(State, chord, key)
  edit.key_release(State, key)

Solving an order conflict in edit.lua at line 622 [6.413]
[5.17561]