resolve conflicts

akkartik

Dec 6, 2024, 8:59 AM

5LB4DFFUFHNDEQY3IIQUWLS63AB422V7R5ZPVUMRWCJSA34EZI4AC

Dependencies

• [2] UPQJIFDP hide file numbers in output editor
• [3] 4VUVVW6J update Readme and settle on a project name
• [4] PCM4JWZA mention a key fork
• [5] OBB3UZ3T resolve conflicts
• [6] D4FEFHQC flesh out Readme
• [7] Y3ZR4TOK Merge lines.love
• [8] H5UZI3YN editor documentation
• [9] 4LW3LB4J Merge text0
• [10] DBGSSFMG add to list of forks
• [11] B4H3KLKR Merge text0
• [12] XD3W2CKG delete redundant method description
• [13] MD3W5IRA new fork: rip out drawing support
• [14] JNAQUQKB Merge lines.love
• [15] OJ2CLK4Q Merge text0
• [16] 2DVVKKVA flesh out Readme
• [17] 2TFAEKOC improve documentation for edit.draw
• [18] 3HHPHDOO couple of typos
• [*] N2NUGNN4 include a brief reference enabling many useful apps
• [*] FS2ITYYH record a known issue

Change contents

• resurrect zombie in reference.md at line 231
  [6.540]→[5.8:109](∅→∅),[6.540]→[5.8:109](∅→∅)
  + * `edit.quit()` -- calling this ensures any final edits are flushed to disk

  + before the app exits.

  +
• edit in reference.md at line 234
  [5.109]→[6.8:395](∅→∅),[6.641]→[6.8:395](∅→∅),[6.641]→[6.8:395](∅→∅)
  − * `edit.draw(state, fg, hide_cursor)` -- call this from `on.draw` to display

  − the current editor state on the app window as requested in the call to

  − `edit.initialize_state` that created `state`. `fg` is the color for

  − foreground text (`Text_color` is a good default). Set `hide_cursor` to stop

  − showing a blinking cursor (usually because you want a `readonly` editor; see

  − below).
• resurrect zombie in reference.md at line 234
  [6.641]→[2.250:732](∅→∅),[6.641]→[2.250:732](∅→∅)
  + * `edit.draw(state, fg, hide_cursor, show_line_numbers)` -- call this from

  + `on.draw` to display the current editor state on the app window as requested

  + in the call to `edit.initialize_state` that created `state`. `fg` is the

  + color for foreground text (`Text_color` is a good default). Set

  + `hide_cursor` to stop showing a blinking cursor (usually because you want a

  + `readonly` editor; see below), and `show_line_numbers` to render line

  + numbers to the left of the editor.
• resolve order conflict in reference.md at line 234
  [5.109]

  [2.250]
• edit in README.md at line 88
  [6.814243]→[4.21:155](∅→∅),[6.814243]→[4.21:155](∅→∅)
  − * https://git.sr.ht/~akkartik/carousel.love - a lightweight environment for

  − writing small, throwaway programs on computer or phone.