resolve conflicts

akkartik

Apr 1, 2026, 7:53 PM

YZVFSDIZOPSQFXNBL2GYTNZXTLENH7EY4K2KSQOOOJOVXIYIY2NAC

Dependencies

[2] A27ZAO4O resolve conflicts
[3] A7MKM5XL better support other keyboard layouts
[4] KKMFQDR4 editing source code from within the app
[5] 3PSFWAIL Merge lines.love
[6] VP5KC4XZ Merge lines.love
[7] VTCPDL3A resolve conflicts
[8] BULPIBEG beginnings of a module for the text editor
[9] TVCPXAAU rename
[10] D2GCFTTT clean up repl functionality
[11] R5QXEHUI somebody stop me
[12] K2X6G75Z start writing some tests for drawings
[13] KKQKPGCI resolve conflicts
[14] VZPH3XJK update source editor
[15] N2NUGNN4 include a brief reference enabling many useful apps
[16] LWPFEZBI Merge lines.love
[17] T4FRZSYL delete an ancient, unused file
[18] 2CTN2IEF Merge lines.love
[19] OGUV4HSA remove some memory leaks from rendered fragments
[20] VXORMHME delete experimental REPL
[21] SGMA5JLE save the list of tests in repo
[22] RUB7L6GY resolve conflicts
[23] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
[24] 6VJTQKW7 start supporting LÖVE v12
[25] GIG6OV3G port keyboard layout handling to source editor
[26] KMSL74GA support selections in the source editor
[27] 6LJZN727 handle chords
[28] MBAJPTDJ resolve conflicts
[29] 4SR3Z4Y3 document the version of LÖVE I've been using
[30] OTIBCAUJ love2d scaffold
[31] JOPVPUSA editing source code from within the app
[32] PT7ICD7Z resolve conflicts
[33] ORKN6EOB Merge lines.love
[34] 73OCE2MC after much struggle, a brute-force undo
[35] VHQCNMAR several more modules
[36] TLOAPLBJ add a license
[37] RSZD5A7G forgot to add json.lua
[38] LXTTOB33 extract a couple of files
[39] XX7G2FFJ intermingle freehand line drawings with text
[40] VHUNJHXB Merge lines.love
[41] QZUFJMD5 resolve conflicts
[42] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[43] BLWAYPKV extract a module
[44] 4YDBYBA4 clean up memory leak experiments
[45] FYJXSWXV resolve conflicts
[46] CE4LZV4T drop last couple of manual tests
[47] ED4Z6ORC cleaner API for file-system access
[48] 3QNOKBFM beginnings of a test harness
[49] 2CK5QI7W make love event names consistent
[50] 2L5MEZV3 experiment: new edit namespace
[51] T42Y5MLO explicitly specify app name
[52] 66X36NZN a little more prose describing manual_tests
[53] 2EELKVO2 resolve conflicts
[54] AVTNUQYR basic test-enabled framework
[55] FS2ITYYH record a known issue
[56] ZLJYLPOT Merge lines.love

Change contents

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

[4.2]→[4.147062:147101](∅→∅),[4.2]→[4.147062:147101](∅→∅),[4.147101]→[4.83723:83723](∅→∅)

-- textinput events can occur on chords with the shift key or AltGr key
-- but not for ctrl, alt or cmd/super/gui
if App.ctrl_down() or App.alt_down() or App.cmd_down() then
return
end
replacement in source_text.lua at line 223

[4.97240]→[4.8:70](∅→∅),[4.70]→[4.8:83](∅→∅),[4.83]→[4.147:238](∅→∅),[4.147]→[4.147:238](∅→∅)

if App.any_modifier_down() then
if App.key_down(t) then
-- The modifiers didn't change the key. Handle it in keychord_press.
return
else
-- Key mutated by the keyboard layout. Continue below.
end

[4.97240]

[4.238]

-- textinput events can occur on chords with the shift key or AltGr key
-- but not for ctrl, alt or cmd/super/gui
if App.ctrl_down() or App.alt_down() or App.cmd_down() then
return