akkartik/pensieve.love - Change 42BVXPWYBQ7EREUD6OZ56TUGD3R5TKXZVJ3IX46KTYWBJ4YF5SPAC

Merge upstream

I also tested here that we're performing fixup_cursor every time we edit a new note.

Created by Kartik K. Agaram on August 14, 2022

42BVXPWYBQ7EREUD6OZ56TUGD3R5TKXZVJ3IX46KTYWBJ4YF5SPAC

Dependencies

In channels

main

Change contents

Deletion in main.lua at line 229 [7.2]
B:BD[6.78] → [4.9:9]
B:BD[8.16] → [5.179:213]
BD:BD[8.16] → [5.179:213]
BD:BD[8.16] → [5.179:213]
```
  edit.fixup_cursor(Editor_state)
```
Solving an order conflict in main.lua at line 229 [7.2]
[6.78]
[10.3]

Deletion in main.lua at line 1501 [7.2]

B:BD[11.4892] → [2.532:532]

B:BD[12.7698] → [5.8:178]

BD:BD[12.7698] → [5.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

Solving an order conflict in main.lua at line 1501 [7.2]
[11.4806]

Insertion in Manual_tests.md at line 69 [15.1]

[3.295]

[14.1251]

* edit a pane that starts with a drawing. Cursor shows up on first line of text.

Merge upstream

Dependencies

In channels

Change contents

Deletion in main.lua at line 229 [7.2]

Solving an order conflict in main.lua at line 229 [7.2]

Deletion in main.lua at line 1501 [7.2]

Solving an order conflict in main.lua at line 1501 [7.2]

Insertion in Manual_tests.md at line 69 [15.1]