resolve conflicts

akkartik

Jun 28, 2024, 5:00 AM

235D5R3ZZ7N5KRIRVRIZXDCR6IYZKZ77LDXZGLUIJAJLRLBZKJ2QC

Dependencies

• [2] XQV3PNH2 resolve conflicts
• [3] T6A5SZGB bugfix: restart search on backspace
• [4] EB6LHFJR use deepcopy where possible
• [5] LNUHQOGH start passing in Editor_state explicitly
• [6] APOMBXMU resolve conflicts
• [7] CIK3U5S6 Merge lines.love
• [8] VYIA2JFX resolve conflicts
• [9] KF72R2XX resolve conflicts
• [10] 5CDHNEKR Merge lines.love
• [11] GFXWHTE6 mouse wheel support
• [12] 656FM555 bugfix: clear selection when clicking above or below lines
• [13] OWE64YJ2 Merge lines.love
• [14] KNWMKLNJ Merge lines.love
• [15] 2L5MEZV3 experiment: new edit namespace
• [16] 54HQZ536 resolve conflicts
• [17] ISOFHXB2 App.width can no longer take a Text
• [18] P4NJ2KS7 resolve conflicts
• [19] Z5WOBP27 Merge lines.love
• [20] VOJISLDC resolve conflicts
• [21] 6XCJX4DZ bugfix: inscript's bug
• [22] 2MGBV7NP bugfix: crash when using mouse wheel

Change contents

• replacement in edit.lua at line 308
  [5.111]→[5.111:190](∅→∅)
  − State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  [5.111]

  [5.190]
  + State.cursor1 = deepcopy(State.screen_top1)
• replacement in edit.lua at line 351
  [5.7547]→[5.7547:7624](∅→∅)
  − State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  [5.7547]

  [5.7624]
  + State.cursor1 = deepcopy(State.screen_top1)
• edit in edit.lua at line 408
  [5.10138]

  [5.10138]
  + State.cursor = deepcopy(State.search_backup.cursor)

  + State.screen_top = deepcopy(State.search_backup.screen_top)

  + Text.search_next(State)
• edit in edit.lua at line 615
  [5.17561]→[2.626:626](∅→∅),[5.1937]→[4.1535:1583](∅→∅),[5.1937]→[4.1535:1583](∅→∅),[5.2934]→[4.1484:1534](∅→∅),[5.2934]→[4.1484:1534](∅→∅),[5.7460]→[3.0:154](∅→∅),[5.7460]→[3.0:154](∅→∅)
  −

  − State.cursor1 = deepcopy(State.screen_top1)

  − State.cursor1 = deepcopy(State.screen_top1)

  − State.cursor = deepcopy(State.search_backup.cursor)

  − State.screen_top = deepcopy(State.search_backup.screen_top)

  − Text.search_next(State)
• resolve order conflict in edit.lua at line 615
  [5.17561]