guest › [sign in] [explore]

Merge upstream

[?]

Aug 14, 2022, 3:12 PM

OWYI7OJT4JQK5R5ABHIYXJDVFBHQ2BRRLQ657OTND6KIPKGXGLBQC

Dependencies

[2] 3IR3ISLL Merge upstream
[3] 5STHSG4U remove some duplication
[4] 4KC7I3E2 make colors easier to edit
[5] 3QQZ7W4E bring couple more globals back to the app level
[6] LNUHQOGH start passing in Editor_state explicitly
[7] SPNMXTYR have file API operate on state object
[8] Z4KNS42N to open a file without a terminal, drag it on!
[9] 5T2E3PDV couple of bugfixes to file-handling
[10] LF7BWEG4 group all editor globals
[11] 2L5MEZV3 experiment: new edit namespace
[12] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[13] HRWN5V6J Devine's suggestion to try to live with just freehand
[14] MGOQ5XAV start uppercasing globals
[15] OTIBCAUJ love2d scaffold
[16] 6LJZN727 handle chords
[17] VG75U7IM bugfix: typing should delete highlighted text
[18] JRLBUB6L more intuitive point delete from polygons
[19] R6GUSTBY default font size and line-height
[20] AVQ5MC5D finish uppercasing all globals
[21] PYLBFWWE overzealous search-and-replace
[22] PWHZPJJM always show current filename in window title
[23] UVIDOW6Z Merge upstream into main
[24] ZLEPKWDJ fork: capture frontend for a note-taking system
[25] ILOA5BYF separate data structure for each line's cache data
[26] MSDHRXWU Merge upstream into main
[27] NYMFNQDT Merge upstream into main
[28] OOL2X3B7 Merge upstream into main
[29] AVTNUQYR basic test-enabled framework
[30] ERQKFTPV extract method
[31] XNFTJHC4 split keyboard handling between Text and Drawing

Change contents

edit in main.lua at line 105

[4.16]→[3.179:213](∅→∅),[4.16]→[3.179:213](∅→∅),[4.16]→[3.179:213](∅→∅)

edit.fixup_cursor(Editor_state)
edit in main.lua at line 173

[4.331]→[2.9:9](∅→∅),[4.7698]→[3.8:178](∅→∅),[4.7698]→[3.8:178](∅→∅),[4.7698]→[3.8:178](∅→∅)

if Editor_state.cursor1.line > #Editor_state.lines or Editor_state.lines[Editor_state.cursor1.line].mode ~= 'text' then
edit.fixup_cursor(Editor_state)
end
resolve order conflict in main.lua at line 173

[4.331]
edit in edit.lua at line 123

[4.3868]→[4.89:123](∅→∅),[4.123]→[3.221:333](∅→∅),[3.333]→[4.347:366](∅→∅),[4.347]→[4.347:366](∅→∅)

function edit.fixup_cursor(State)
for i,line in ipairs(State.lines) do
if line.mode == 'text' then
State.cursor1.line = i
break
end
end
end