resolve conflicts

akkartik

Jul 22, 2024, 9:42 PM

QLJOWU6RGNP6ZFUMWU2C5OJLKU7HSMTDDDD6J3XCKOPY64FY3HHQC

Dependencies

[2] MZ3DMYPD start sketching out a scrollbar
[3] 3PFDYZWT resolve conflicts
[4] CFJ4FLCQ clean up an unnecessary mutation
[5] I5RBM7HJ resolve conflicts
[6] TGHAJBES use line cache for drawings as well
[7] PX7DDEMO autosave slightly less aggressively
[8] SPSW74Y5 add state arg to Text.keychord_pressed
[9] UHB4GARJ left/right margin -> left/right coordinates
[10] LF7BWEG4 group all editor globals
[11] Z5HLXU4P add state arg to a few functions
[12] GN3IF4WF bugfix: pasting newlines
[13] AYS3Z3TX standardize scroll check in a few places
[14] XNFTJHC4 split keyboard handling between Text and Drawing
[15] BWKKYJIM add a fork
[16] MTJEVRJR add state arg to a few functions
[17] 2DVVKKVA flesh out Readme
[18] JRETETTL Merge lines.love
[19] SBS2F7GR link to export tool
[20] M3F33OYQ Merge lines.love
[21] OJ2CLK4Q Merge text0
[22] GX5PD3CL consistently schedule_save after all mutations
[23] VNTRXQSX Merge lines.love
[24] LSYLEVBD drop some redundant args when clearing the cache
[25] PTDO2SOT add state arg to schedule_save
[26] WHFOJBAE Merge text0
[27] QJAGP7ON Merge text0
[28] NJRUQTNH Merge text0
[29] ILOA5BYF separate data structure for each line's cache data
[30] ICS45BIL editor widget now takes a bottom margin
[31] T36DC4DF add another fork
[32] RTV7W3GU Merge text0
[33] 7LVK4KRD fix a failing test
[34] D4FEFHQC flesh out Readme
[35] 4VUVVW6J update Readme and settle on a project name
[*] BULPIBEG beginnings of a module for the text editor
[*] FS2ITYYH record a known issue

Change contents

resurrect zombie in text.lua at line 191

[6.192]→[6.94:156](∅→∅),[6.192]→[6.94:156](∅→∅)

if State.cursor_y > State.bottom - State.line_height then
resurrect zombie in text.lua at line 279

[6.3922]→[2.144:206](∅→∅),[6.3922]→[2.144:206](∅→∅)

Text.refresh_screen_line_cache(State, State.cursor1.line)
edit in README.md at line 92

[6.1673]→[3.73:73](∅→∅),[6.98]→[5.52:52](∅→∅),[6.98]→[5.52:52](∅→∅)
resolve order conflict in README.md at line 92

[6.1673]