resolve conflicts

akkartik

Jul 22, 2024, 9:10 PM

4ATFJ4RXYEMF7ZYOGNOGDXRRSQJGV4KV7MCKLUY56NG37HTZZ7DQC

Dependencies

• [2] GYTD7DDW resolve conflicts
• [3] GX5PD3CL consistently schedule_save after all mutations
• [4] LNUHQOGH start passing in Editor_state explicitly
• [5] P4NJ2KS7 resolve conflicts
• [6] VOJISLDC resolve conflicts
• [7] 54HQZ536 resolve conflicts
• [8] XQV3PNH2 resolve conflicts
• [9] WJBZZQE4 fold together two largely similar cases
• [10] WLJCIXYM add state arg to a few functions
• [11] OWE64YJ2 Merge lines.love
• [12] 235D5R3Z resolve conflicts
• [13] TWSPUEHF resolve conflicts
• [14] LF7BWEG4 group all editor globals
• [15] KF72R2XX resolve conflicts
• [16] Z5WOBP27 Merge lines.love
• [17] CIK3U5S6 Merge lines.love
• [18] PTDO2SOT add state arg to schedule_save
• [19] K6DTOGOQ flip return value of button handlers
• [20] 2L5MEZV3 experiment: new edit namespace
• [21] 5CDHNEKR Merge lines.love
• [22] UHB4GARJ left/right margin -> left/right coordinates
• [23] 6D5MOJS4 allow buttons to interrupt events
• [24] MTJEVRJR add state arg to a few functions
• [25] KNWMKLNJ Merge lines.love
• [26] APOMBXMU resolve conflicts
• [27] VYIA2JFX resolve conflicts

Change contents

• edit in edit.lua at line 189
  [4.2136]→[4.2136:2180](∅→∅)
  − schedule_save(State)
• edit in edit.lua at line 190
  [4.2304]

  [4.2304]
  + schedule_save(State)
• edit in edit.lua at line 300
  [4.6062]→[4.6062:6087](∅→∅)
  − schedule_save(State)
• edit in edit.lua at line 304
  [4.6263]

  [4.6263]
  + schedule_save(State)
• edit in edit.lua at line 495
  [4.13606]→[4.13606:13631](∅→∅)
  − schedule_save(State)
• edit in edit.lua at line 496
  [4.13733]

  [4.13733]
  + schedule_save(State)
• edit in edit.lua at line 612
  [4.17561]→[2.157:157](∅→∅),[4.14368]→[3.679:781](∅→∅),[4.14368]→[3.679:781](∅→∅),[4.8797]→[3.653:678](∅→∅),[4.8797]→[3.653:678](∅→∅),[4.935]→[3.608:652](∅→∅),[4.935]→[3.608:652](∅→∅)
  −

  − record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

  − schedule_save(State)

  − schedule_save(State)
• resolve order conflict in edit.lua at line 612
  [4.17561]