resolve conflicts

akkartik

Jun 11, 2024, 8:09 PM

GX7SKZNAPHMBQYXMDPKR5MJ5PXUS3K2TBD5G3SH2KL35SSJHCXWQC

Dependencies

• [2] SDTOPZJS fix another crash when increasing font size too much
• [3] CRBLAWBO resolve conflicts
• [4] YXQOITYS Merge lines.love
• [5] R2ASHK5C fix a bad merge
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in edit.lua at line 204
  [4.3374]→[2.24:211](∅→∅),[4.3374]→[2.24:211](∅→∅)
  − if State.screen_bottom1.line == nil then

  − -- text box is too tiny; we didn't print anything

  − State.screen_bottom1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

  − end
• edit in edit.lua at line 231
  [4.2196]→[2.212:399](∅→∅),[4.2196]→[2.212:399](∅→∅)
  − if State.screen_bottom1.line == nil then

  − -- text box is too tiny; we didn't print anything

  − State.screen_bottom1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

  − end