resolve conflicts

akkartik

Feb 17, 2024, 5:25 AM

54HQZ536JEDWZCQC4IEXHX3745ZH6WF2GKMUCSPERDH7ZX2VYZNQC

Dependencies

• [2] VOJISLDC resolve conflicts
• [3] 2J5CURWY ensure tapping on editor brings up soft keyboard
• [4] Z5WOBP27 Merge lines.love
• [5] P4NJ2KS7 resolve conflicts
• [6] KF72R2XX resolve conflicts
• [7] KNWMKLNJ Merge lines.love
• [8] CIK3U5S6 Merge lines.love
• [9] 5CDHNEKR Merge lines.love
• [10] 2L5MEZV3 experiment: new edit namespace
• [11] OWE64YJ2 Merge lines.love
• [12] APOMBXMU resolve conflicts
• [13] VYIA2JFX resolve conflicts
• [14] KYNGDE2C consistent names in a few more places
• [15] LNUHQOGH start passing in Editor_state explicitly

Change contents

• edit in edit.lua at line 239
  [4.3452]

  [4.3452]
  + love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• edit in edit.lua at line 623
  [4.17561]→[2.341:341](∅→∅),[4.721]→[3.74:147](∅→∅),[4.721]→[3.74:147](∅→∅)
  −

  − love.keyboard.setTextInput(true) -- bring up keyboard on touch screen
• resolve order conflict in edit.lua at line 623
  [4.17561]