resolve conflicts

akkartik

Oct 30, 2024, 3:31 AM

LJW6E6DU5SUF3EZCOD6RRL2QMCEBBVRKBFXFG5MLTXXCKYCG6CCAC

Dependencies

• [2] O47TQ6W6 resolve conflicts
• [3] F5KCYFOY simpler implementation of bugfix #2
• [4] OXIU3SJ2 bugfix #3, attempt #2 in search UI
• [5] CIK3U5S6 Merge lines.love
• [6] OWE64YJ2 Merge lines.love
• [7] APOMBXMU resolve conflicts
• [8] VOJISLDC resolve conflicts
• [9] P4NJ2KS7 resolve conflicts
• [10] GYTD7DDW resolve conflicts
• [11] TWSPUEHF resolve conflicts
• [12] 54HQZ536 resolve conflicts
• [13] FWPU6TTQ resolve conflicts
• [14] 4ATFJ4RX resolve conflicts
• [15] Z5WOBP27 Merge lines.love
• [16] KF72R2XX resolve conflicts
• [17] KNWMKLNJ Merge lines.love
• [18] 5CDHNEKR Merge lines.love
• [19] 2L5MEZV3 experiment: new edit namespace
• [20] XQV3PNH2 resolve conflicts
• [21] 235D5R3Z resolve conflicts
• [22] 3R6VAVPX resolve conflicts
• [23] VYIA2JFX resolve conflicts

Change contents

• edit in edit.lua at line 153
  [4.133]→[4.218:522](∅→∅),[4.522]→[4.192:212](∅→∅),[4.192]→[4.192:212](∅→∅),[4.212]→[4.523:851](∅→∅)
  − end

  − end

  −

  − function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)

  − local line = State.cursor1.line

  − local max = #State.lines

  − for _ = 1, max-1 do

  − line = (line+1) % max

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

  − State.cursor1.line = line

  − State.cursor1.pos = 1

  − break

  − end

  − end

  − end

  −

  − function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)

  − local cursor_line = State.lines[State.cursor1.line].data

  − if State.cursor1.pos <= utf8.len(cursor_line) then

  − State.cursor1.pos = State.cursor1.pos + 1

  − else

  − edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
• replacement in edit.lua at line 410
  [4.889]→[4.889:966](∅→∅)
  − edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
  [4.889]

  [4.966]
  + Text.right(State)
• edit in edit.lua at line 611
  [4.17561]→[2.65:65](∅→∅),[4.72]→[3.56:82](∅→∅),[4.72]→[3.56:82](∅→∅)
  −

  − Text.right(State)
• resolve order conflict in edit.lua at line 611
  [4.17561]