resolve conflicts

akkartik

Sep 1, 2024, 8:05 AM

FWPU6TTQGBTBTTNFEQTKIAVSM76K5M2FBODNGASGWREPF5VMD5KAC

Dependencies

• [2] 4ATFJ4RX resolve conflicts
• [3] 237LRHDO clean up Drawing.before after creating undo event
• [4] 6TBU3VTN explicitly state when operations manage undo
• [5] WYK3HCQD clean up some issues I now feel confident about
• [6] GYTD7DDW resolve conflicts
• [7] APOMBXMU resolve conflicts
• [8] OO5GDU53 pijul bug: why did previous change not have any effect?
• [9] Z5WOBP27 Merge lines.love
• [10] MLG2OGU7 things seem to feel snappier now
• [11] ZLEPKWDJ fork: capture frontend for a note-taking system
• [12] OWE64YJ2 Merge lines.love
• [13] 5CDHNEKR Merge lines.love
• [14] LNUHQOGH start passing in Editor_state explicitly
• [15] VOJISLDC resolve conflicts
• [16] 6D5MOJS4 allow buttons to interrupt events
• [17] UHB4GARJ left/right margin -> left/right coordinates
• [18] LF7BWEG4 group all editor globals
• [19] XQV3PNH2 resolve conflicts
• [20] IFTYOERM line.y -> line_cache.starty in a few more places
• [21] MUDXM3JI clearing starty is redundant in mutations
• [22] JUU6KXPC bugfix: don't clear selection on M-arrow
• [23] KNWMKLNJ Merge lines.love
• [24] GX5PD3CL consistently schedule_save after all mutations
• [25] 54HQZ536 resolve conflicts
• [26] IDGP4BJZ new known issue with drawings
• [27] KF72R2XX resolve conflicts
• [28] TWSPUEHF resolve conflicts
• [29] F4QQIBEH clarify what "large files" means
• [30] 34TC5SYK record another known issue I don't know how to fix yet
• [31] P4NJ2KS7 resolve conflicts
• [32] MTIS2XTC affirm a priority
• [33] 2L5MEZV3 experiment: new edit namespace
• [34] FPY4LO2W make a few names consistent with snake_case
• [35] CIK3U5S6 Merge lines.love
• [36] 235D5R3Z resolve conflicts
• [37] K6DTOGOQ flip return value of button handlers
• [38] VYIA2JFX resolve conflicts
• [39] WJBZZQE4 fold together two largely similar cases
• [*] FS2ITYYH record a known issue

Change contents

• edit in edit.lua at line 189
  [6.2304]

  [2.29]
  + Drawing.before = nil
• replacement in edit.lua at line 391
  [6.214]→[6.9329:9387](∅→∅),[6.9329]→[6.9329:9387](∅→∅)
  − Text.delete_selection(State, State.left, State.right)
  [6.214]

  [6.9387]
  + Text.delete_selection_and_record_undo_event(State)
• replacement in edit.lua at line 472
  [6.12722]→[6.12722:12787](∅→∅)
  − local s = Text.cut_selection(State, State.left, State.right)
  [6.12615]

  [6.12787]
  + local s = Text.cut_selection_and_record_undo_event(State)
• edit in edit.lua at line 611
  [6.17561]→[2.127:127](∅→∅),[6.13432]→[4.782:844](∅→∅),[6.13432]→[4.782:844](∅→∅),[6.185]→[4.726:781](∅→∅),[6.185]→[4.726:781](∅→∅),[6.185]→[4.726:781](∅→∅),[6.935]→[3.45:89](∅→∅),[6.935]→[3.45:89](∅→∅),[6.935]→[3.45:89](∅→∅)
  −

  − local s = Text.cut_selection_and_record_undo_event(State)

  − Text.delete_selection_and_record_undo_event(State)

  − Drawing.before = nil
• resolve order conflict in edit.lua at line 611
  [6.17561]
• edit in README.md at line 54
  [6.95]→[6.1548:1624](∅→∅),[6.95]→[6.1548:1624](∅→∅)
  − other ways. capture.love works well in all circumstances with files under