Fixed merged conflicts of 2973th pull request#5003

Open

keyboardNinjaWarrior wants to merge 11 commits intotermux:masterfrom

keyboardNinjaWarrior:sixel

Commits on Feb 26, 2026

Changed: Bump actions/upload-artifact from 6 to 7
dependabot[bot]
authored

Commits on Mar 9, 2026

Clear LineWrap flag when clearing lines using blockSet.

MatanZ
authored and
Nadeem Anwar
committed

Commits on Mar 15, 2026

Don't GC the current sixel
Nadeem Anwar
committed
`\007` is bell, only if not ending APC or OSC.

MatanZ
authored and
Nadeem Anwar
committed
Better handling of Out of Memory errors in bitmap allocations.

MatanZ
authored and
Nadeem Anwar
committed
Refactor bitmap code

MatanZ
authored and
Nadeem Anwar
committed
Copy the set of keys from the map before iterating.

MatanZ
authored and
Nadeem Anwar
committed
Handle another failure path

MatanZ
authored and
Nadeem Anwar
committed
Ignore line feeds (and similar control characters) inside base64 data

MatanZ
authored and
Nadeem Anwar
committed
Start first text run after the last column of bitmap, instead on the last column.

MatanZ
authored and
Nadeem Anwar
committed
Catch another out of memory error in image code

MatanZ
authored and
Nadeem Anwar
committed