akkartik/pothi.love - Change FCLOWADYHASOF7QIAYWEXIQW4XO3VRQYQWPNDLTGBCT7D4JTXH2AC

In-progress browser for a directory of text files

resolve conflicts

Created by akkartik on January 22, 2024

FCLOWADYHASOF7QIAYWEXIQW4XO3VRQYQWPNDLTGBCT7D4JTXH2AC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 455 [5.1]
B:BD[4.4544] → [2.727:762]
BD:BD[4.4544] → [2.727:762]
∅:D[2.762] → [6.6:6]
∅:D[7.766] → [6.6:6]
BD:BD[8.5714] → [6.6:6]
```
--?       print(State.cursor1.pos)
```

Resurrecting zombie bytes in text.lua at line 455 [5.1]

B:B[8.5568] → [3.135:263]

BD:B[8.5568] → [3.135:263]

      State.cursor1.pos = Text.nearest_cursor_pos(State.font, State.lines[State.cursor1.line].data, State.cursor_x, State.left)

Replacement in text.lua at line 456 [5.1]
B:BD[8.5714] → [3.265:265]
BD:BD[8.5714] → [3.265:265]
[3.263]
[9.1313]
```
--?       print(State.cursor1.pos)
```
Resurrecting zombie bytes in text.lua at line 472 [5.1]
∅:∅[7.1176] → [4.4545:4775]
∅:∅[2.1192] → [4.4545:4775]
B:B[10.4338] → [4.4545:4775]
D:∅[10.4338] → [4.4545:4775]
D:∅[10.4338] → [4.4545:4775]
BD:B[7.1176] → [4.4545:4775]
BD:B[2.1192] → [4.4545:4775]
```
    local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)
    local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)
```
Deletion in text.lua at line 474 [5.1]
B:BD[12.1720] → [2.1193:1267]
BD:BD[12.1720] → [2.1193:1267]
```
--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
```
Resurrecting zombie bytes in text.lua at line 474 [5.1]
∅:∅[3.267] → [11.775:901]
B:B[13.7111] → [11.775:901]
BD:B[13.7111] → [11.775:901]
```
    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1
```

Insertion in text.lua at line 475 [5.1]

[11.901]

[14.130]

--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)