akkartik/broadsheet.love - Change UFOVVX3ZFH3QBAGBUPNY7CO6WXC4LRD2E54YQVADK2LHKXKC7X4QC

Merge text0

Created by Kartik K. Agaram on June 4, 2023

UFOVVX3ZFH3QBAGBUPNY7CO6WXC4LRD2E54YQVADK2LHKXKC7X4QC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 816 [5.2]

B:BD[4.497] → [4.497:592]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[4.497]

[4.592]

  edit.draw(Editor_state, Text_color)  -- populate line_cache.starty for each line Editor_state.line_cache

Replacement in text_tests.lua at line 855 [5.2]
B:BD[6.720] → [6.720:746]
```
  edit.draw(Editor_state)
```
[6.720]
[6.746]
```
  edit.draw(Editor_state, Text_color)
```
Replacement in text_tests.lua at line 931 [5.2]
B:BD[7.357] → [7.357:383]
```
  edit.draw(Editor_state)
```
[7.357]
[7.383]
```
  edit.draw(Editor_state, Text_color)
```

Insertion in main.lua at line 73 [10.2]

[8.1119]

[9.7]

end
function print_and_log(s)
  print(s)
  log(3, s)

Deletion in main.lua at line 136 [10.2]
B:BD[11.735] → [2.82:82]
B:BD[12.3084] → [3.10:59]
BD:BD[12.3084] → [3.10:59]
```
function print_and_log(s)
  print(s)
  log(3, s)
```
Resurrecting zombie bytes in main.lua at line 136 [10.2]
B:B[3.59] → [3.59:64]
BD:B[3.59] → [3.59:64]
```
end
```
Solving an order conflict in main.lua at line 136 [10.2]
[11.735]
[3.59]
Deletion in main.lua at line 138 [10.2]
∅:D[14.75] → [12.5107:5112]
∅:D[2.82] → [12.5107:5112]
∅:D[15.406] → [12.5107:5112]
∅:D[11.735] → [12.5107:5112]
∅:D[16.742] → [12.5107:5112]
B:BD[12.5107] → [12.5107:5112]
```
end
```

Replacement in edit.lua at line 120 [17.413]

B:BD[17.5853] → [18.4284:4377]

B:BD[17.5853] → [19.6004:6074]

    y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos, fg, hide_cursor)
    y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos)

[17.5853]

[20.9765]

    y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, fg, hide_cursor)

Deletion in app.lua at line 482 [23.2]
B:BD[21.61192] → [22.389:389]
B:BD[24.1994] → [4.1289:1308]
BD:BD[24.1994] → [4.1289:1308]
```
--?     _G[name]()
```
Solving an order conflict in app.lua at line 482 [23.2]
[21.61192]

Merge text0

Dependencies

In channels

Change contents

Replacement in text_tests.lua at line 816 [5.2]

Replacement in text_tests.lua at line 855 [5.2]

Replacement in text_tests.lua at line 931 [5.2]

Insertion in main.lua at line 73 [10.2]

Deletion in main.lua at line 136 [10.2]

Resurrecting zombie bytes in main.lua at line 136 [10.2]

Solving an order conflict in main.lua at line 136 [10.2]

Deletion in main.lua at line 138 [10.2]

Replacement in edit.lua at line 120 [17.413]

Deletion in app.lua at line 482 [23.2]

Solving an order conflict in app.lua at line 482 [23.2]