resolve conflicts

akkartik

Sep 27, 2024, 4:26 AM

F26BRBBLDOA5TSNAIWFVB3MZYPHDINPYYDWWPO6EBP4EOUHXHLVQC

Dependencies

• [2] TBTKFVCE resolve conflicts
• [3] 2SE2CRDR make print _much_ more efficient
• [4] 4HCP3NTO draw code editor after menu and output
• [5] YK5FRJWH print to output buffer in all callbacks
• [6] RK2ASPN7 add lots of buttons to the toolbar
• [7] 7SJHYHMB clean up the setFont gotcha
• [8] Q4CJ4WWU switch to a single global output editor
• [9] I52S4E5F running `print` now appends to output editor
• [10] 5OCELN37 bugfix in output editor wrapping
• [*] ZM7NOBRM new fork: carousel shell

Change contents

• edit in 0050-print_to_output at line 5
  [4.1566]→[4.1084:1122](∅→∅)
  − Text.redraw_all(Output_editor_state)
• edit in 0012-on.draw at line 20
  [4.37]

  [2.197]
  + if #Output_editor_state.lines ~= #Output_editor_state.line_cache then

  + Text.redraw_all(Output_editor_state)

  + end
• edit in 0012-on.draw at line 26
  [4.37]→[3.0:157](∅→∅),[4.37]→[3.0:157](∅→∅)
  − if #Current_pane.output_editor_state.lines ~= #Current_pane.output_editor_state.line_cache then

  − Text.redraw_all(Current_pane.output_editor_state)

  − end
• resolve order conflict in 0012-on.draw at line 26
  [2.327]

  [4.8243]