resolve conflicts

akkartik

Jul 22, 2024, 9:33 PM

I5RBM7HJ5OH2FTP5GN3LIZWTPLZ5KUIHX7XGKV76CJFRIE3CN2LAC

Dependencies

• [2] 4L3UAM75 experiment: knob for readonly editor
• [3] BWKKYJIM add a fork
• [4] QZUFJMD5 resolve conflicts
• [5] MTJEVRJR add state arg to a few functions
• [6] J5TTQDPZ new fork
• [7] 2CK5QI7W make love event names consistent
• [8] T36DC4DF add another fork
• [9] GX5PD3CL consistently schedule_save after all mutations
• [10] CG3264MM move
• [11] XNFTJHC4 split keyboard handling between Text and Drawing
• [12] NJRUQTNH Merge text0
• [13] LSYLEVBD drop some redundant args when clearing the cache
• [14] SPSW74Y5 add state arg to Text.keychord_pressed
• [15] PTDO2SOT add state arg to schedule_save
• [16] MD3W5IRA new fork: rip out drawing support
• [17] D4FEFHQC flesh out Readme
• [18] SBS2F7GR link to export tool
• [19] 3VPHONXQ Merge lines.love
• [20] 2DVVKKVA flesh out Readme
• [*] BULPIBEG beginnings of a module for the text editor
• [*] FS2ITYYH record a known issue

Change contents

• resurrect zombie in text.lua at line 170
  [5.121]→[2.325:348](∅→∅),[5.121]→[2.325:348](∅→∅)
  + if not readonly then
• resolve order conflict in text.lua at line 171
  [2.348]

  [5.4]
• edit in text.lua at line 266
  [5.1891]

  [2.349]
  + schedule_save(State)
• edit in text.lua at line 269
  [5.1891]→[5.279:304](∅→∅)
  − schedule_save(State)
• resolve order conflict in text.lua at line 269
  [2.361]

  [5.209]
• edit in README.md at line 87
  [3.98]→[5.23:23](∅→∅),[5.150]→[5.23:23](∅→∅),[5.12675]→[4.547:547](∅→∅)
  −

  −
• resolve order conflict in README.md at line 87
  [3.98]

  [5.145]