resolve conflicts

akkartik

Jul 10, 2024, 5:28 AM

TDXO2NXXQRU6CQLZTRBA7PBD2735SKJ4HIORDBIPQJ464W6RDBPQC

Dependencies

• [2] RKRBRQ4Y bugfix: render text in given fg color
• [3] 7ZXZGVHM purge obsolete term 'fragment'
• [4] ULKLJBN6 couple of renames
• [5] UBA2ZUCP remove a duplicate print to screen
• [6] HALS7E5U more clearly skip prints before screen top
• [7] XVR2O5PI change text cursor shape
• [8] RTDYYP4H bugfix: text past cursor was rendered red on wrapped lines
• [9] 5DOC2CBM extract a function
• [10] Z4XRNDTR find text
• [11] H2DPLWMV snapshot: wrapping long lines at word boundaries
• [12] I64IPGJX avoid saving fragments in lines
• [13] 2RXZ3PGO beginning of a new approach to scroll+wrap
• [14] 3TFEAQSW start using some globals
• [*] BULPIBEG beginnings of a module for the text editor

Change contents

• resurrect zombie in text.lua at line 63
  [4.151]→[2.4:24](∅→∅),[4.151]→[2.4:24](∅→∅)
  + App.color(fg)
• edit in text.lua at line 63
  [4.2604]

  [2.4]
  + -- render screen line
• edit in text.lua at line 65
  [4.2604]→[3.4:32](∅→∅),[4.2604]→[3.4:32](∅→∅)
  − -- render screen line
• resolve order conflict in text.lua at line 65
  [2.24]

  [4.179]