resolve conflicts

akkartik

Jul 22, 2024, 8:47 PM

KMUX4B6GYZRPZ7LFME7ACSJ6IVDNFK3JIXUSVYR7JFLXP6JAT5NAC

Dependencies

• [2] 7CEOB56D Merge upstream into main
• [3] 6CAUCATU Merge lines.love
• [4] QDSIJM76 Merge lines.love
• [5] PATWQOHR register a new add-on tool
• [6] GX5PD3CL consistently schedule_save after all mutations
• [7] D4FEFHQC flesh out Readme
• [8] LF7BWEG4 group all editor globals
• [9] EQP53UQV autosave slightly less aggressively
• [10] LSNGRF4K Merge lines.love
• [11] 3TDOZESE extract scrolling logic out of insert_return
• [12] SBS2F7GR link to export tool
• [13] 27DROQW2 Merge upstream into main
• [14] SPSW74Y5 add state arg to Text.keychord_pressed
• [15] MTJEVRJR add state arg to a few functions
• [16] 5YJBJO37 mention a new tool
• [17] IRCKL6VN extract scrolling logic out of insert_at_cursor
• [18] 2ZYV7D3W handle tab characters
• [19] XNFTJHC4 split keyboard handling between Text and Drawing
• [20] PTDO2SOT add state arg to schedule_save
• [21] CZU7JNNA resolve conflicts
• [22] PX7DDEMO autosave slightly less aggressively
• [23] G3DLS5OU audit all asserts
• [24] ZS5IYZH5 stop caching screen_bottom1
• [25] VSWGW4Q7 ignore tools for other forks
• [*] BULPIBEG beginnings of a module for the text editor
• [*] FS2ITYYH record a known issue

Change contents

• edit in text.lua at line 164
  [7.28]→[7.1211:1313](∅→∅),[7.28]→[7.1211:1313](∅→∅)
  − record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
• edit in text.lua at line 173
  [7.814]→[7.29:54](∅→∅),[7.814]→[7.29:54](∅→∅)
  − schedule_save(State)
• resurrect zombie in text.lua at line 173
  [7.54]→[7.1370:1459](∅→∅),[7.54]→[7.1370:1459](∅→∅)
  + record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
• edit in text.lua at line 223
  [7.108]→[7.1586:1675](∅→∅),[7.108]→[7.1586:1675](∅→∅)
  − record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
• edit in README.md at line 127
  [7.1673]→[3.38:38](∅→∅),[7.131]→[5.0:179](∅→∅),[7.131]→[5.0:179](∅→∅),[7.131]→[5.0:179](∅→∅)
  −

  − * https://codeberg.org/eril/lines2html.love provides the option to export

  − just the drawings to a directory. Also provides a CLI, which should be more

  − natural for many people.
• resolve order conflict in README.md at line 127
  [7.1673]