resolve conflicts

akkartik

Oct 30, 2024, 12:55 AM

O47TQ6W6LLMRKHQXYT5PSRIFH4E6RJDTAYPVQG3MW2NM7I3D4V2AC

Dependencies

• [2] 3R6VAVPX resolve conflicts
• [3] OXIU3SJ2 bugfix #3, attempt #2 in search UI
• [4] 4FTOQOPZ bugfix #2 in search UI
• [5] T6A5SZGB bugfix: restart search on backspace
• [6] 2L5MEZV3 experiment: new edit namespace
• [7] 5ZA3BRNY add state arg to a few functions
• [8] APOMBXMU resolve conflicts
• [9] KNWMKLNJ Merge lines.love
• [10] 4ATFJ4RX resolve conflicts
• [11] 235D5R3Z resolve conflicts
• [12] 6PRGXS6X bugfix #3 in search UI
• [13] 5CDHNEKR Merge lines.love
• [14] FWPU6TTQ resolve conflicts
• [15] VOJISLDC resolve conflicts
• [16] KF72R2XX resolve conflicts
• [17] O7YTBRQY bugfix: restart search on backspace
• [18] LF7BWEG4 group all editor globals
• [19] P4NJ2KS7 resolve conflicts
• [20] 54HQZ536 resolve conflicts
• [21] XQV3PNH2 resolve conflicts
• [22] OWE64YJ2 Merge lines.love
• [23] GYTD7DDW resolve conflicts
• [24] TWSPUEHF resolve conflicts
• [25] CIK3U5S6 Merge lines.love
• [26] LNUHQOGH start passing in Editor_state explicitly
• [27] VYIA2JFX resolve conflicts
• [28] Z5WOBP27 Merge lines.love

Change contents

• replacement in edit.lua at line 436
  [4.10276]→[2.1009:1092](∅→∅)
  − if #State.search_term > 0 then

  − Text.search_previous(State)

  − end
  [4.10276]

  [4.10310]
  + Text.search_previous(State)
• edit in edit.lua at line 633
  [4.17561]→[2.1094:1094](∅→∅),[4.11621]→[3.35:191](∅→∅),[4.11621]→[3.35:191](∅→∅),[4.11710]→[4.198:232](∅→∅),[4.11710]→[4.198:232](∅→∅)
  −

  − if #State.search_term > 0 then

  − edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)

  − Text.search_next(State)

  − end

  − Text.search_previous(State)
• resolve order conflict in edit.lua at line 633
  [4.17561]