resolve conflicts

akkartik

Feb 5, 2024, 1:28 AM

VOJISLDCFDI2USUKF3FCERHEI4C3SRLIMGSLRJUEH45VOAAUWFLAC

Dependencies

• [2] KF72R2XX resolve conflicts
• [3] FHNPQBLK more carefully pass the 'key' arg around
• [4] JUU6KXPC bugfix: don't clear selection on M-arrow
• [5] KNWMKLNJ Merge lines.love
• [6] Z3IQ6A4R bugfix
• [7] OO5GDU53 pijul bug: why did previous change not have any effect?
• [8] UHB4GARJ left/right margin -> left/right coordinates
• [9] Z3BQO2RK typo
• [10] LF7BWEG4 group all editor globals
• [11] OWE64YJ2 Merge lines.love
• [12] 5CDHNEKR Merge lines.love
• [13] BH7BT36L ctrl+a: select entire buffer
• [14] WK6UK5AJ enhance bugfix of commit a9aa3436f (Dec 2024)
• [15] P4NJ2KS7 resolve conflicts
• [16] VYIA2JFX resolve conflicts
• [17] 2L5MEZV3 experiment: new edit namespace
• [18] APYPFFS3 call edit rather than App callbacks in tests
• [19] 2CK5QI7W make love event names consistent
• [20] APOMBXMU resolve conflicts
• [21] Z5WOBP27 Merge lines.love
• [22] LNUHQOGH start passing in Editor_state explicitly
• [23] CIK3U5S6 Merge lines.love

Change contents

• replacement in edit.lua at line 399
  [5.9142]→[5.9142:9329](∅→∅)
  − chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(chord) then
  [5.9142]

  [5.9329]
  + chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then
• replacement in edit.lua at line 589
  [5.16602]→[5.16602:16718](∅→∅)
  − function edit.run_after_keychord(State, chord)

  − edit.keychord_press(State, chord)

  − edit.key_release(State, chord)
  [5.16602]

  [5.16718]
  + function edit.run_after_keychord(State, chord, key)

  + edit.keychord_press(State, chord, key)

  + edit.key_release(State, key)
• edit in edit.lua at line 622
  [5.17561]→[2.330:330](∅→∅),[5.10752]→[4.0:185](∅→∅),[5.10752]→[4.0:185](∅→∅),[5.6020]→[3.9575:9699](∅→∅),[5.6020]→[3.9575:9699](∅→∅)
  −

  − chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

  − function edit.run_after_keychord(State, chord, key)

  − edit.keychord_press(State, chord, key)

  − edit.key_release(State, key)
• resolve order conflict in edit.lua at line 622
  [5.17561]