resolve conflicts

akkartik

Dec 2, 2023, 6:26 AM

QLZHLCO67PUYWESTCXCCRQYUQ3X6DC5TDWMSEDUZ2GJDMFSVAS4AC

Dependencies

• [2] IOTIKKUC don't draw highlight if State didn't receive mouse_press
• [3] JFFUF5AL override mouse state lookups in tests
• [4] QJISOCHJ some temporary logging to catch a bug
• [5] OV6FE23R Merge text0
• [6] XZ6QVCTT manually maintain mouse button press state
• [7] MXA3RZYK deduce left/right from state where possible
• [8] WKXJNESI resolve conflicts
• [9] LXTTOB33 extract a couple of files
• [10] R2ASHK5C fix a bad merge
• [11] S2MISTTM add state arg to a few functions
• [12] LF7BWEG4 group all editor globals
• [13] DRFE3B3Z mouse buttons are integers, not strings
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in select.lua at line 14
  [3.44671]→[2.0:27](∅→∅)
  − if State.mouse_down then
• edit in edit.lua at line 162
  [3.1861]→[2.28:62](∅→∅)
  − State.mouse_down = mouse_button