resolve conflicts

akkartik

Sep 1, 2024, 7:53 AM

NXU5C47QJJTPMUITKH63CMEFECQWZZD2RS27XR6DYCLO77TEILUQC

Dependencies

• [2] 7CEOB56D Merge upstream into main
• [3] 6TBU3VTN explicitly state when operations manage undo
• [4] XNFTJHC4 split keyboard handling between Text and Drawing
• [5] DHI6IJCN selecting text and deleting selections
• [6] SPSW74Y5 add state arg to Text.keychord_pressed
• [7] S2MISTTM add state arg to a few functions
• [8] UHB4GARJ left/right margin -> left/right coordinates
• [9] 27DROQW2 Merge upstream into main
• [10] PX7DDEMO autosave slightly less aggressively
• [11] PTDO2SOT add state arg to schedule_save
• [*] BULPIBEG beginnings of a module for the text editor

Change contents

• edit in text.lua at line 225
  [4.2976]→[4.15732:15792](∅→∅),[4.2976]→[4.15732:15792](∅→∅)
  − Text.delete_selection(State, State.left, State.right)
• resurrect zombie in text.lua at line 226
  [3.119]→[4.109:136](∅→∅),[4.339]→[4.109:136](∅→∅),[4.15792]→[4.109:136](∅→∅),[4.3060]→[4.109:136](∅→∅),[4.15792]→[4.109:136](∅→∅)
  + schedule_save(State)