akkartik/techmeet-capture.love - Change OWYI7OJT4JQK5R5ABHIYXJDVFBHQ2BRRLQ657OTND6KIPKGXGLBQC

Merge upstream

Created by Kartik K. Agaram on August 14, 2022

OWYI7OJT4JQK5R5ABHIYXJDVFBHQ2BRRLQ657OTND6KIPKGXGLBQC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 105 [5.2]
B:BD[4.16] → [3.179:213]
BD:BD[4.16] → [3.179:213]
BD:BD[4.16] → [3.179:213]
```
  edit.fixup_cursor(Editor_state)
```

Deletion in main.lua at line 173 [5.2]

B:BD[7.331] → [2.9:9]

B:BD[8.7698] → [3.8:178]

BD:BD[8.7698] → [3.8:178]

    if Editor_state.cursor1.line > #Editor_state.lines or Editor_state.lines[Editor_state.cursor1.line].mode ~= 'text' then
      edit.fixup_cursor(Editor_state)
    end

Solving an order conflict in main.lua at line 173 [5.2]
[7.331]

Deletion in edit.lua at line 123 [10.413]

B:BD[10.3868] → [11.89:123]

B:BD[11.123] → [3.221:333]

∅:D[3.333] → [11.347:366]

B:BD[11.347] → [11.347:366]

function edit.fixup_cursor(State)
  for i,line in ipairs(State.lines) do
    if line.mode == 'text' then
      State.cursor1.line = i
      break
    end
  end
end