akkartik/lines-polygon-experiment - Change 7IJOTKHSNMJTP66V5DRCAIIRPSPXJWIP3CDHGOZFMABECFULYAMAC

resolve conflicts

Created by akkartik on August 16, 2025

7IJOTKHSNMJTP66V5DRCAIIRPSPXJWIP3CDHGOZFMABECFULYAMAC

Dependencies

In channels

main

Change contents

Deletion in text_tests.lua at line 2 [7.2]
B:BD[5.981] → [6.2:103]
BD:BD[5.981] → [6.2:103]
∅:D[6.103] → [9.2:7]
∅:D[10.156] → [9.2:7]
∅:D[11.165] → [9.2:7]
B:BD[5.1122] → [9.2:7]
B:BD[9.7] → [10.158:158]
BD:BD[9.7] → [10.158:158]
∅:D[12.3] → [13.7:60]
∅:D[10.158] → [13.7:60]
B:BD[13.7] → [13.7:60]
BD:BD[13.7] → [13.7:60]
B:BD[13.118] → [13.118:208]
BD:BD[13.118] → [13.118:208]
∅:D[14.4361] → [15.12632:12667]
B:BD[13.654] → [15.12632:12667]
D:D[14.4361] → [15.12632:12667]
BD:BD[13.654] → [15.12632:12667]
BD:BD[14.4361] → [15.12632:12667]
B:BD[16.246] → [17.1477:1547]
BD:BD[16.246] → [17.1477:1547]
B:BD[17.1547] → [2.2:131]
BD:BD[17.1547] → [2.2:131]
∅:D[2.131] → [12.4:9]
∅:D[6.155] → [12.4:9]
∅:D[10.256] → [12.4:9]
B:BD[13.927] → [12.4:9]
BD:BD[2.131] → [12.4:9]
BD:BD[6.155] → [12.4:9]
BD:BD[10.256] → [12.4:9]
BD:BD[13.927] → [12.4:9]
```
  check_eq(Editor_state.cursor1.pos, 15, 'cursor')  -- one more than the number of UTF-8 code-points
end
function test_click_past_end_of_word_wrapping_line()
  -- display a long line wrapping at a word boundary on a screen of more realistic length
  y = y + Editor_state.line_height
  edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 21, 'cursor')
end
```
Deletion in text_tests.lua at line 19 [7.2]
B:BD[18.756] → [2.133:133]
BD:BD[18.756] → [2.133:133]
Resurrecting zombie bytes in conf.lua at line 3 [19.33]
B:B[19.79] → [4.233:264]
BD:B[19.79] → [4.233:264]
```
  t.window.usedpiscale = false
```
Solving an order conflict in conf.lua at line 3 [19.33]
[3.74]
[4.233]

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text_tests.lua at line 2 [7.2]

Deletion in text_tests.lua at line 19 [7.2]

Resurrecting zombie bytes in conf.lua at line 3 [19.33]

Solving an order conflict in conf.lua at line 3 [19.33]