resolve conflicts

akkartik

Dec 29, 2023, 11:27 PM

AQZ7YIX5GWZTE2SAMFOWHAUYYLFLKPG423R6PJOP6RDFIXXPVHFQC

Dependencies

• [2] YV2GBDNW preserve settings across restart
• [3] IS3FHU6Q resolve conflicts
• [4] R2ASHK5C fix a bad merge
• [5] CNCYMM6A make test initializations a little more obvious
• [6] 3XNFQDDN Merge lines.love
• [7] UPQJIFDP hide file numbers in output editor
• [8] RK2ASPN7 add lots of buttons to the toolbar
• [9] ZMBPXIZ4 bugfix
• [10] ICS45BIL editor widget now takes a bottom margin
• [11] UHB4GARJ left/right margin -> left/right coordinates
• [12] KKQKPGCI resolve conflicts
• [13] O2E2MUT2 resolve conflicts
• [14] QMRQL2FO resolve conflicts
• [15] OV6FE23R Merge text0
• [16] 5XA7TKWY pull font into editor
• [17] LF7BWEG4 group all editor globals
• [18] 2L5MEZV3 experiment: new edit namespace

Change contents

• replacement in edit.lua at line 21
  [4.596]→[4.469:552](∅→∅),[4.596]→[4.1167:1295](∅→∅)
  − function edit.initialize_state(top, bottom, left, right, font_height, line_height)

  − function edit.initialize_state(top, left, right, font, font_height, line_height) -- currently always draws to bottom of screen
  [4.596]

  [4.94319]
  + function edit.initialize_state(top, bottom, left, right, font, font_height, line_height)
• resurrect zombie in edit.lua at line 112
  [4.58]→[4.740:802](∅→∅),[4.58]→[4.740:802](∅→∅)
  + function edit.draw(State, fg, hide_cursor, show_line_numbers)
• edit in edit.lua at line 113
  [4.802]→[4.16:16](∅→∅),[4.58]→[4.16:16](∅→∅),[4.58]→[3.143:143](∅→∅),[4.58]→[3.143:143](∅→∅)
  −

  −
• resolve order conflict in edit.lua at line 113
  [4.802]

  [4.1603]
• replacement in 0070-code_editor_state at line 7
  [4.2772]→[2.788:817](∅→∅)
  − Font_height, Line_height)
  [4.2772]

  [4.2825]
  + Font, Font_height, Line_height)
• replacement in 0069-output_editor_state at line 6
  [4.3102]→[2.819:848](∅→∅)
  − Font_height, Line_height)
  [4.3102]

  [4.3155]
  + Font, Font_height, Line_height)