resolve conflicts

akkartik

Oct 30, 2024, 1:29 AM

MQCCBXP2CDFMLJALMRLYZ6IKER7AYKU6PPEGVY4GWCZUXSW6R7CQC

Dependencies

• [2] 4FTOQOPZ bugfix #2 in search UI
• [3] AMOPICKV bugfix: check after cursor on same line when searching upwards
• [4] O7YTBRQY bugfix: restart search on backspace
• [*] LXTTOB33 extract a couple of files

Change contents

• replacement in text_tests.lua at line 1961
  [2.47]→[2.47:73](∅→∅)
  − edit.draw(Editor_state)
  [2.47]

  [2.73]
  + edit.draw(Editor_state, Text_color)
• replacement in text_tests.lua at line 1975
  [3.316]→[3.316:342](∅→∅)
  − edit.draw(Editor_state)
  [3.316]

  [3.342]
  + edit.draw(Editor_state, Text_color)