resolve conflicts

akkartik

Jul 10, 2024, 5:41 AM

2C6R7IUI5CL5YBBUR2XN3DN6VZTWGXLV2F55JWYMMJBJJPBPYVQQC

Dependencies

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

Change contents

• edit in text.lua at line 70
  [4.2604]→[3.4:32](∅→∅),[4.2604]→[3.4:32](∅→∅),[3.32]→[4.4:24](∅→∅),[4.151]→[4.4:24](∅→∅),[4.151]→[4.4:24](∅→∅),[4.24]→[3.34:34](∅→∅),[4.24]→[3.34:34](∅→∅)
  − -- render screen line

  − App.color(fg)

  −