resolve conflicts

akkartik

Jan 22, 2025, 11:47 PM

ZDPKT7VBD3UPDQQH26PJECMSQG6QSVHNIRRULDKLRUXM2LBTSV6AC

Dependencies

• [2] LJW6E6DU resolve conflicts
• [3] ZLWFFQHI bugfix: scrolling up using scroll wheel
• [4] OWE64YJ2 Merge lines.love
• [5] 54HQZ536 resolve conflicts
• [6] 235D5R3Z resolve conflicts
• [7] 4ATFJ4RX resolve conflicts
• [8] XQV3PNH2 resolve conflicts
• [9] O7YTBRQY bugfix: restart search on backspace
• [10] APOMBXMU resolve conflicts
• [11] TWSPUEHF resolve conflicts
• [12] 3R6VAVPX resolve conflicts
• [13] KNWMKLNJ Merge lines.love
• [14] O47TQ6W6 resolve conflicts
• [15] CIK3U5S6 Merge lines.love
• [16] F5KCYFOY simpler implementation of bugfix #2
• [17] 5CDHNEKR Merge lines.love
• [18] GYTD7DDW resolve conflicts
• [19] FWPU6TTQ resolve conflicts
• [20] Z5WOBP27 Merge lines.love
• [21] KF72R2XX resolve conflicts
• [22] P4NJ2KS7 resolve conflicts
• [23] NVSC4N4K change a helper slightly
• [24] VOJISLDC resolve conflicts
• [25] VYIA2JFX resolve conflicts
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• replacement in edit.lua at line 146
  [4.63]→[4.63:94](∅→∅)
  − while line < #State.lines do
  [4.63]

  [4.94]
  + if State.lines[line].mode == 'text' then return end

  + while line <= #State.lines and State.lines[line].mode ~= 'text' do
• replacement in edit.lua at line 149
  [4.112]→[4.112:217](∅→∅),[4.217]→[4.113:133](∅→∅),[4.113]→[4.113:133](∅→∅)
  − if State.lines[line].mode == 'text' then

  − State.cursor1.line = line

  − State.cursor1.pos = 1

  − break

  − end
  [4.112]

  [4.349]
  + end

  + if line <= #State.lines and State.lines[line].mode == 'text' then

  + State.cursor1.line = line

  + State.cursor1.pos = 1
• edit in edit.lua at line 611
  [4.17561]→[2.57:57](∅→∅),[4.2150]→[3.408:538](∅→∅),[4.2150]→[3.408:538](∅→∅),[4.2150]→[3.408:538](∅→∅),[4.2101]→[3.284:407](∅→∅),[4.2101]→[3.284:407](∅→∅)
  −

  − end

  − if line <= #State.lines and State.lines[line].mode == 'text' then

  − State.cursor1.line = line

  − State.cursor1.pos = 1

  − if State.lines[line].mode == 'text' then return end

  − while line <= #State.lines and State.lines[line].mode ~= 'text' do
• resolve order conflict in edit.lua at line 611
  [4.17561]