resolve conflicts

akkartik

Nov 12, 2025, 6:38 PM

DLKGHBKMLLWWHGJXGYYYAG3YQA5YBEPIODCIY4O46L5PGRS6PXPQC

Dependencies

• [2] IZCRWSKF Merge lines.love
• [3] 6XLI6GUR resolve conflicts
• [4] WPE23OJF resolve conflicts
• [5] BKX2TYUG use cmd key on Mac OS for some idiomatic shortcuts
• [6] LNUHQOGH start passing in Editor_state explicitly
• [7] 235D5R3Z resolve conflicts
• [8] 4FTOQOPZ bugfix #2 in search UI
• [9] S2MISTTM add state arg to a few functions
• [10] QCPXQ2E3 add state arg to a few functions
• [11] LF7BWEG4 group all editor globals
• [12] KF72R2XX resolve conflicts
• [13] ZDPKT7VB resolve conflicts
• [14] Z3BQO2RK typo
• [15] BH7BT36L ctrl+a: select entire buffer
• [16] 2L5MEZV3 experiment: new edit namespace
• [17] UZQ2LGHQ bugfix: preserve window position
• [18] KNWMKLNJ Merge lines.love
• [19] XQV3PNH2 resolve conflicts
• [20] H6QZ7GRR more precise name
• [21] 54HQZ536 resolve conflicts
• [22] PTDO2SOT add state arg to schedule_save
• [23] Z5WOBP27 Merge lines.love
• [24] TWSPUEHF resolve conflicts
• [25] FWPU6TTQ resolve conflicts
• [26] P4NJ2KS7 resolve conflicts
• [27] O47TQ6W6 resolve conflicts
• [28] 5ZA3BRNY add state arg to a few functions
• [29] LJW6E6DU resolve conflicts
• [30] VYIA2JFX resolve conflicts
• [31] VOJISLDC resolve conflicts
• [32] 3R6VAVPX resolve conflicts
• [33] PV2YA7KS subsection headings in a long switch
• [34] OO5GDU53 pijul bug: why did previous change not have any effect?
• [35] WK6UK5AJ enhance bugfix of commit a9aa3436f (Dec 2024)
• [36] APOMBXMU resolve conflicts
• [37] 4ATFJ4RX resolve conflicts
• [38] 6TBU3VTN explicitly state when operations manage undo
• [39] A42EMHOQ plumb through all supported args in LÖVE handlers
• [40] Z3IQ6A4R bugfix
• [41] FPY4LO2W make a few names consistent with snake_case
• [42] KKMFQDR4 editing source code from within the app
• [43] OWE64YJ2 Merge lines.love
• [44] 53GCKYYS resolve conflicts
• [45] CIK3U5S6 Merge lines.love
• [46] GYTD7DDW resolve conflicts
• [47] 5CDHNEKR Merge lines.love
• [48] O4RRXNOK bugfix: disallow font size of 0
• [49] JUU6KXPC bugfix: don't clear selection on M-arrow
• [50] 6PRGXS6X bugfix #3 in search UI
• [51] MTJEVRJR add state arg to a few functions
• [*] OTIBCAUJ love2d scaffold
• [*] MHOUX5JF experiment: turn off JIT

Change contents

• edit in run.lua at line 70
  [6.130]→[6.130:187](∅→∅),[6.130]→[6.130:187](∅→∅)
  − local os = love.system.getOS()

  − if os == 'Linux' then
• resurrect zombie in run.lua at line 71
  [5.621]→[6.187:423](∅→∅),[6.187]→[6.187:423](∅→∅),[6.187]→[6.187:423](∅→∅)
  + -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.

  + App.screen.move(settings.x, settings.y-37, settings.displayindex)

  + else

  + App.screen.move(settings.x, settings.y, settings.displayindex)

  + end
• edit in main.lua at line 83
  [3.273]

  [54.8]
  +

  + OS = love.system.getOS()
• edit in edit.lua at line 394
  [6.402]

  [6.8839]
  + local dm = App.default_modifier
• replacement in edit.lua at line 400
  [6.9142]→[6.29:214](∅→∅)
  − chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then
  [6.9142]

  [6.74]
  + chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then
• replacement in edit.lua at line 429
  [6.10329]→[6.10329:10358](∅→∅)
  − elseif chord == 'C-f' then
  [6.10329]

  [6.10358]
  + elseif chord == dm('f') then
• replacement in edit.lua at line 436
  [6.10567]→[6.10567:10596](∅→∅)
  − elseif chord == 'C-=' then
  [6.10567]

  [6.10596]
  + elseif chord == dm('=') then
• replacement in edit.lua at line 439
  [6.10681]→[6.10681:10710](∅→∅)
  − elseif chord == 'C--' then
  [6.10681]

  [6.10710]
  + elseif chord == dm('-') then
• replacement in edit.lua at line 444
  [6.10841]→[6.10841:10870](∅→∅)
  − elseif chord == 'C-0' then
  [6.10841]

  [6.10870]
  + elseif chord == dm('0') then
• replacement in edit.lua at line 448
  [6.10948]→[6.10948:10977](∅→∅)
  − elseif chord == 'C-z' then
  [6.10948]

  [6.11084]
  + elseif chord == dm('z') then
• replacement in edit.lua at line 461
  [6.11660]→[6.11660:11689](∅→∅)
  − elseif chord == 'C-y' then
  [6.11660]

  [6.11796]
  + elseif chord == dm('y') then
• replacement in edit.lua at line 475
  [6.12316]→[6.12316:12345](∅→∅)
  − elseif chord == 'C-a' then
  [6.12316]

  [6.12345]
  + elseif chord == dm('a') then
• replacement in edit.lua at line 478
  [6.12472]→[6.12472:12501](∅→∅)
  − elseif chord == 'C-c' then
  [6.12472]

  [6.12501]
  + elseif chord == dm('c') then
• replacement in edit.lua at line 483
  [6.12586]→[6.12586:12615](∅→∅)
  − elseif chord == 'C-x' then
  [6.12586]

  [6.130]
  + elseif chord == dm('x') then
• replacement in edit.lua at line 489
  [6.12861]→[6.12861:12890](∅→∅)
  − elseif chord == 'C-v' then
  [6.12861]

  [6.12997]
  + elseif chord == dm('v') then
• edit in edit.lua at line 623
  [6.17561]→[4.209:209](∅→∅),[6.551]→[5.1484:1515](∅→∅),[6.551]→[5.1484:1515](∅→∅),[6.13403]→[5.1452:1483](∅→∅),[6.13403]→[5.1452:1483](∅→∅),[6.13403]→[5.1452:1483](∅→∅),[6.657]→[5.1420:1451](∅→∅),[6.657]→[5.1420:1451](∅→∅),[6.13212]→[5.1388:1419](∅→∅),[6.13212]→[5.1388:1419](∅→∅),[6.12717]→[5.1356:1387](∅→∅),[6.12717]→[5.1356:1387](∅→∅),[6.36]→[5.1324:1355](∅→∅),[6.36]→[5.1324:1355](∅→∅),[6.289]→[5.1292:1323](∅→∅),[6.289]→[5.1292:1323](∅→∅),[6.6814]→[5.1260:1291](∅→∅),[6.6814]→[5.1260:1291](∅→∅),[6.25]→[5.1228:1259](∅→∅),[6.25]→[5.1228:1259](∅→∅),[6.11758]→[5.1196:1227](∅→∅),[6.11758]→[5.1196:1227](∅→∅),[6.10752]→[5.1000:1195](∅→∅),[6.10752]→[5.1000:1195](∅→∅),[6.10752]→[5.1000:1195](∅→∅),[6.3715]→[5.965:999](∅→∅),[6.3715]→[5.965:999](∅→∅),[6.3715]→[5.965:999](∅→∅)
  −

  − elseif chord == dm('v') then

  − elseif chord == dm('x') then

  − elseif chord == dm('c') then

  − elseif chord == dm('a') then

  − elseif chord == dm('y') then

  − elseif chord == dm('z') then

  − elseif chord == dm('0') then

  − elseif chord == dm('-') then

  − elseif chord == dm('=') then

  − elseif chord == dm('f') then

  − chord ~= dm('a') and chord ~= dm('c') and chord ~= dm('x') and chord ~= 'backspace' and chord ~= 'delete' and chord ~= dm('z') and chord ~= dm('y') and not App.is_cursor_movement(key) then

  − local dm = App.default_modifier
• resolve order conflict in edit.lua at line 623
  [6.17561]