resolve conflicts

akkartik

Jun 16, 2024, 12:54 PM

BYPIN6SHJL6X52IEXROXRCYNO3GNDSQZMA6G3MJPDEYFL23R5AMAC

Dependencies

• [2] 2YRXYXKE resolve conflicts
• [3] NSM73TX3 crap, fix some final changes in the source editor
• [4] 2TCIWW6Z stop caching starty
• [5] KMSL74GA support selections in the source editor
• [6] KKMFQDR4 editing source code from within the app
• [7] 5SM6DRHK port inscript's bugfix to source editor
• [8] CUFW4EJL reorganize app.lua and its comments
• [9] ZS5IYZH5 stop caching screen_bottom1
• [*] 3QNOKBFM beginnings of a test harness

Change contents

• edit in source_text.lua at line 445
  [4.2593]→[3.8:103](∅→∅)
  − if State.lines[loc2.line].mode == 'drawing' then

  − y = y + Drawing_padding_top

  − end
• resolve order conflict in source_text.lua at line 445
  [2.227]

  [4.2593]
• edit in source_text.lua at line 449
  [4.2781]→[2.228:321](∅→∅)
  − y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom
• edit in source_text.lua at line 1110
  [4.145772]→[3.198:257](∅→∅)
  − State.cursor1 = Text.final_text_loc_on_screen(State)
• resolve order conflict in source_text.lua at line 1110
  [2.381]

  [4.145985]
• edit in source_select.lua at line 72
  [4.4297]→[2.384:408](∅→∅)
  − if y < State.top then
• edit in app.lua at line 135
  [4.8755]→[3.310:345](∅→∅)
  − --? test_click_below_all_lines()
• resolve order conflict in app.lua at line 135
  [2.648]

  [4.842]