resolve conflicts

akkartik

Jan 22, 2025, 11:59 PM

P6NKDBXEV6PMAULOELKZ6JD3GPPIHW6MF2UTGVDQ74CZBJEOY5YQC

Dependencies

[2] DKL7KWKO resolve conflict
[3] KFEUQWHX resolve conflicts
[4] OTYGZVPW Merge text.love
[5] VBU5YHLR Merge lines.love
[6] BLWAYPKV extract a module
[7] R56CKHYZ Merge text.love
[8] 6LJZN727 handle chords
[9] LXTTOB33 extract a couple of files
[10] FHZ5AG3M resolve conflicts
[11] SLMSBVJW resolve conflicts
[12] TBTRYEBP Merge lines.love
[13] FS2ITYYH record a known issue
[14] CE4LZV4T drop last couple of manual tests
[15] VP5KC4XZ Merge lines.love
[16] 3QNOKBFM beginnings of a test harness
[17] SGMA5JLE save the list of tests in repo
[18] XX7G2FFJ intermingle freehand line drawings with text
[19] N2NUGNN4 include a brief reference enabling many useful apps
[20] M5JXTW56 Merge text.love
[21] S7CSVBHZ resolve conflicts
[22] KQ22RW43 resolve conflicts
[23] 66X36NZN a little more prose describing manual_tests
[24] KKQKPGCI resolve conflicts
[25] TVCPXAAU rename
[26] QXXISTGE resolve conflicts
[27] QIR3VBYI resolve conflicts
[28] 4YDBYBA4 clean up memory leak experiments
[29] 6VJTQKW7 start supporting LÖVE v12
[30] MBAJPTDJ resolve conflicts
[31] SYWQBIO5 resolve conflicts
[32] AVTNUQYR basic test-enabled framework
[33] VLTU33KW resolve conflicts
[34] ORKN6EOB Merge lines.love
[35] TOXPJJYY resolve conflicts
[36] OTIBCAUJ love2d scaffold
[37] ZLJYLPOT Merge lines.love
[38] RSZD5A7G forgot to add json.lua
[39] 2CTN2IEF Merge lines.love
[40] BULPIBEG beginnings of a module for the text editor
[41] VHUNJHXB Merge lines.love
[42] OGUV4HSA remove some memory leaks from rendered fragments
[43] 7LXXQBNE resolve conflicts
[44] KKMFQDR4 editing source code from within the app
[45] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[46] 73OCE2MC after much struggle, a brute-force undo
[47] CZ6X73VY merge bugfix
[48] PJ5PQAQE record support for multiple versions
[49] ED4Z6ORC cleaner API for file-system access
[50] 36Z442IV back to commit 8123959e52f without code editing
[51] R5QXEHUI somebody stop me
[52] I4S4EFYX Merge lines.love
[53] T4FRZSYL delete an ancient, unused file
[54] 4SR3Z4Y3 document the version of LÖVE I've been using
[55] KJLZCK2R resolve conflicts
[56] VXORMHME delete experimental REPL
[57] 65WSX5RJ resolve conflicts
[58] 2L5MEZV3 experiment: new edit namespace
[59] JOPVPUSA editing source code from within the app
[60] 4Y2QDDAZ resolve conflicts
[61] KMSL74GA support selections in the source editor
[62] LWPFEZBI Merge lines.love
[63] CAG7PP5Y Merge text.love
[64] D2GCFTTT clean up repl functionality
[65] K2X6G75Z start writing some tests for drawings
[66] VXRYVZ74 Merge text.love
[67] 34BZ5ZKN Merge lines.love
[68] QSHQIVF3 resolve conflicts
[69] 3PSFWAIL Merge lines.love
[70] RXMHAZ6V resolve conflicts
[71] TLOAPLBJ add a license
[72] 2CFLXLIE Merge text.love
[73] R6MNUXDJ pijul bug
[74] VHQCNMAR several more modules

Change contents

file deletion: source_edit.lua (----------)source_edit.lua (----------)

[4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)

if State.lines[line].mode == 'text' then return end
while line <= #State.lines and State.lines[line].mode ~= 'text' do
end
if line <= #State.lines and State.lines[line].mode == 'text' then
State.cursor1.line = line
State.cursor1.pos = 1
end
end

line = line+1