resolve conflicts

akkartik

Jan 22, 2024, 4:10 PM

YPTADWWWHNBK3DF665HJHBPCOBJN4XGTFH44672IR6VKQKE66ZAAC

Dependencies

• [2] XYK7ESSI Merge lines.love
• [3] XMYXWERK Merge lines.love
• [4] PFT5Y2ZY move
• [5] UFTS236M merge edits
• [6] OEIR7M74 Merge lines.love
• [7] JSJSVQAX Merge lines.love
• [8] S7FTRC4E Merge lines.love
• [*] BULPIBEG beginnings of a module for the text editor

Change contents

• replacement in text.lua at line 30
  [4.202]→[4.202:288](∅→∅)
  − local lo, hi = Text.clip_filename_with_screen_line(line, line_cache, i, s, e)
  [4.202]

  [4.288]
  + local lo, hi = Text.clip_filename_with_screen_line(State.font, line, line_cache, i, s, e)
• replacement in text.lua at line 166
  [4.1460]→[4.1460:1532](∅→∅)
  − function Text.clip_filename_with_screen_line(line, line_cache, i, s, e)
  [4.1460]

  [4.1532]
  + function Text.clip_filename_with_screen_line(font, line, line_cache, i, s, e)
• replacement in text.lua at line 188
  [4.2034]→[3.3:89](∅→∅)
  − return App.width(line.data:sub(soff, loff-1)), App.width(line.data:sub(soff, hoff))
  [4.2034]

  [4.2114]
  + return font:getWidth(line.data:sub(soff, loff-1)), font:getWidth(line.data:sub(soff, hoff))