resolve conflicts

akkartik

Dec 17, 2023, 7:47 AM

VYIA2JFXSDSLUBTWUA5KRJSPJOJZVZ2WDU7E4BHRCUFUZIGZ2AKAC

Dependencies

• [2] P4NJ2KS7 resolve conflicts
• [3] GJ4LBCIE streamline button.lua
• [4] K6DTOGOQ flip return value of button handlers
• [5] 5CDHNEKR Merge lines.love
• [6] CIK3U5S6 Merge lines.love
• [7] XZ6QVCTT manually maintain mouse button press state
• [8] KNWMKLNJ Merge lines.love
• [9] 6D5MOJS4 allow buttons to interrupt events
• [10] OWE64YJ2 Merge lines.love
• [11] LNUHQOGH start passing in Editor_state explicitly
• [12] 6XCJX4DZ bugfix: inscript's bug
• [13] APOMBXMU resolve conflicts
• [14] Z5WOBP27 Merge lines.love
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• replacement in edit.lua at line 240
  [4.3596]→[4.3596:3675](∅→∅)
  − if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then
  [4.3596]

  [4.3675]
  + if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
• edit in edit.lua at line 619
  [4.17561]→[2.91:91](∅→∅),[4.2254]→[3.266:337](∅→∅),[4.2254]→[3.266:337](∅→∅)
  −

  − if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
• resolve order conflict in edit.lua at line 619
  [4.17561]