resolve conflicts

akkartik

Aug 16, 2025, 8:58 PM

3OBCSR7IEFCGHGTCTONECSY75A4R4RZGSETTCLE3TEREUK37LNWAC

Dependencies

• [2] OEIR7M74 Merge lines.love
• [3] RYDNS7OB resolve conflicts
• [4] B4USRORM disable DPI scaling
• [5] I64IPGJX avoid saving fragments in lines
• [6] RLCO2SNK wrap lines like lines2 forks
• [7] T42Y5MLO explicitly specify app name
• [8] PFT5Y2ZY move
• [9] R5OKMVVC fix a regression in line wrapping
• [*] BULPIBEG beginnings of a module for the text editor

Change contents

• resurrect zombie in text.lua at line 154
  [5.2237]→[2.621:1253](∅→∅),[5.2237]→[2.621:1253](∅→∅)
  + end

  + end

  +

  + function Text.populate_link_offsets(State, line_index)

  + local line = State.lines[line_index]

  + if line.mode ~= 'text' then return end

  + local line_cache = State.line_cache[line_index]

  + if line_cache.link_offsets then

  + return

  + end

  + line_cache.link_offsets = {}

  + local pos = 1

  + -- try to wrap at word boundaries

  + local s, e = 1, 0

  + while s <= #line.data do

  + s, e = line.data:find('%w+', s)

  + if s == nil then break end

  + local word = line.data:sub(s, e)

  + if file_exists(word) then

  + --? print('filename:', s, e, word)

  + table.insert(line_cache.link_offsets, {s, e, word})

  + end

  + s = e + 1
• edit in text.lua at line 155
  [2.627]

  [2.627]
  + return true
• edit in text.lua at line 179
  [5.1563]→[5.8971:8985](∅→∅)
  − return true
• resurrect zombie in conf.lua at line 3
  [5.79]→[4.233:264](∅→∅),[5.79]→[4.233:264](∅→∅)
  + t.window.usedpiscale = false
• resolve order conflict in conf.lua at line 3
  [3.65]

  [4.233]