akkartik/view.love - Change 5ZFZXX3KD3UR34EMNY4SI5GNX6TAHVXRTKFZIZPOYEWS7XSMBU5QC

Fork of lines.love for browsing read-only text files; useful starting point for further forks

resolve conflicts

Created by akkartik on September 1, 2024

5ZFZXX3KD3UR34EMNY4SI5GNX6TAHVXRTKFZIZPOYEWS7XSMBU5QC

Dependencies

In channels

main

Change contents

Deletion in undo.lua at line 17 [4.1]

B:BD[4.154] → [5.1:97]

BD:BD[4.154] → [5.1:97]

-- makes a copy of lines on every single keystroke; will be inefficient with really long lines.

Solving an order conflict in undo.lua at line 17 [4.1]
[2.483]
Deletion in text.lua at line 140 [9.1]
B:BD[7.1225] → [8.4:61]
BD:BD[7.1225] → [8.4:61]
B:BD[7.2976] → [8.62:119]
BD:BD[7.2976] → [8.62:119]
```
      Text.delete_selection_and_record_undo_event(State)
      Text.delete_selection_and_record_undo_event(State)
```
Deletion in select.lua at line 76 [11.43980]
B:BD[10.10] → [8.538:595]
BD:BD[10.10] → [8.538:595]
B:BD[12.1669] → [8.596:649]
BD:BD[12.1669] → [8.596:649]
B:BD[11.46500] → [8.650:710]
BD:BD[11.46500] → [8.650:710]
```
function Text.cut_selection_and_record_undo_event(State)
  Text.delete_selection_and_record_undo_event(State)
function Text.delete_selection_and_record_undo_event(State)
```
Deletion in edit.lua at line 293 [14.413]
B:BD[13.9064] → [3.365:427]
BD:BD[13.9064] → [3.365:427]
```
    local s = Text.cut_selection_and_record_undo_event(State)
```