resolve conflicts

akkartik

Nov 25, 2023, 3:45 AM

VCMGGGWIIV3NAQS76EXXREQXNWY7KUBBRH3P3Q77YUPBWOULXITQC

Dependencies

• [2] FQAZKPOO bugfix: infinite loop if window is too narrow
• [3] AIHGJ4BT bugfix: infinite loop inside a very narrow window
• [4] I64IPGJX avoid saving fragments in lines
• [5] UPCIYZEU drop an unnecessary level of indent
• [*] BULPIBEG beginnings of a module for the text editor

Change contents

• edit in text.lua at line 138
  [3.1892]→[2.0:192](∅→∅)
  − if x == 0 and bpos == 0 then

  − assert(false, ("Infinite loop while line-wrapping. Editor is %dpx wide; window is %dpx wide"):format(State.width, App.screen.width))

  − end