Merge lines.love

Dependencies

• [2] 57OGXVHZ Merge lines.love
• [3] OI4FPFIN support drawings in the source editor
• [4] TSK2OXU2 .
• [5] WQOSZSUE warn on unused commandline args
• [6] MHOUX5JF experiment: turn off JIT
• [7] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [8] KKMFQDR4 editing source code from within the app
• [9] ZLEPKWDJ fork: capture frontend for a note-taking system
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 53
  [5.185525]→[5.185525:185584](∅→∅),[5.185525]→[5.185525:185584](∅→∅)
  − load_file_from_source_or_save_directory('icons.lua')
• resurrect zombie in main.lua at line 53
  [5.185584]→[5.185584:185709](∅→∅),[5.185584]→[5.185584:185709](∅→∅)
  + load_file_from_source_or_save_directory('text_tests.lua')

  + load_file_from_source_or_save_directory('run_tests.lua')
• edit in main.lua at line 55
  [5.185709]→[5.185709:185949](∅→∅),[5.185709]→[5.185709:185949](∅→∅),[5.185949]→[5.185949:185956](∅→∅),[5.185949]→[5.185949:185956](∅→∅),[5.185949]→[5.185949:185956](∅→∅)
  − load_file_from_source_or_save_directory('drawing.lua')

  − load_file_from_source_or_save_directory('geom.lua')

  − load_file_from_source_or_save_directory('help.lua')

  − load_file_from_source_or_save_directory('drawing_tests.lua')

  − else
• resurrect zombie in main.lua at line 55
  [5.185709]→[4.16:54](∅→∅),[5.185709]→[4.16:54](∅→∅)
  + elseif Current_app == 'source' then
• resurrect zombie in main.lua at line 56
  [4.54]→[5.185956:186724](∅→∅),[5.185956]→[5.185956:186724](∅→∅),[5.185956]→[5.185956:186724](∅→∅),[5.185956]→[5.185956:186724](∅→∅)
  + load_file_from_source_or_save_directory('source_file.lua')

  + load_file_from_source_or_save_directory('source.lua')

  + load_file_from_source_or_save_directory('commands.lua')

  + load_file_from_source_or_save_directory('source_edit.lua')

  + load_file_from_source_or_save_directory('log_browser.lua')

  + load_file_from_source_or_save_directory('source_text.lua')

  + load_file_from_source_or_save_directory('search.lua')

  + load_file_from_source_or_save_directory('select.lua')

  + load_file_from_source_or_save_directory('source_undo.lua')

  + load_file_from_source_or_save_directory('colorize.lua')

  + load_file_from_source_or_save_directory('source_text_tests.lua')

  + load_file_from_source_or_save_directory('source_tests.lua')
• edit in main.lua at line 68
  [5.186724]

  [2.431]
  + else

  + assert(false, 'unknown app "'..Current_app..'"')
• edit in main.lua at line 263
  [5.268]→[2.887:887](∅→∅),[5.186724]→[4.55:115](∅→∅),[5.186724]→[4.55:115](∅→∅),[5.186724]→[4.55:115](∅→∅)
  −

  − else

  − assert(false, 'unknown app "'..Current_app..'"')
• resolve order conflict in main.lua at line 263
  [5.268]