akkartik/pothi.love - Change O566A6VCVW5SZJHX25UK3GFNN53YYMIOHP7JPJX2DDWFKJDWKJ7AC

Merge luaML.love

Created by Kartik K. Agaram on June 8, 2023

O566A6VCVW5SZJHX25UK3GFNN53YYMIOHP7JPJX2DDWFKJDWKJ7AC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 61 [7.1]

B:B[6.3671] → [2.277:405]

BD:B[6.3671] → [2.277:405]

            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y, Cursor_color, fg or Text_color)

Insertion in text.lua at line 61 [7.1]

[8.854]

[2.277]

          elseif hide_cursor then
            Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          else

Deletion in text.lua at line 957 [7.1]

B:BD[9.442] → [3.239:239]

B:BD[8.854] → [5.4:157]

BD:BD[8.854] → [5.4:157]

∅:D[5.157] → [10.6:6]

BD:BD[6.3671] → [10.6:6]

          elseif hide_cursor then
            Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
          else

Solving an order conflict in text.lua at line 957 [7.1]
[9.442]
Deletion in edit.lua at line 231 [12.413]
B:BD[11.5675] → [4.13:38]
BD:BD[11.5675] → [4.13:38]
```
  assert(State.cursor_x)
```
Insertion in edit.lua at line 232 [12.413]
[5.698]
[5.698]
```
  assert(State.cursor_x)
```
Insertion in edit.lua at line 342 [12.413]
[12.13640]
[13.123]
```
  elseif not readonly and chord == 'C-v' then
```

Merge luaML.love

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 61 [7.1]

Insertion in text.lua at line 61 [7.1]

Deletion in text.lua at line 957 [7.1]

Solving an order conflict in text.lua at line 957 [7.1]

Deletion in edit.lua at line 231 [12.413]

Insertion in edit.lua at line 232 [12.413]

Insertion in edit.lua at line 342 [12.413]