h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 12:21:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make command run by __fish_echo output to TTY for color detection

Browse Source 
Without this, e.g. Alt-L shows the directory entries one per line and
without colors.

Closes #11888
This commit is contained in:
Xiretza
2025-10-05 14:46:25 +00:00
committed by Johannes Altmanninger
parent 74ba4e9a98
commit b7fabb11ac
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@@ -7,6 +7,7 @@ fish 4.1.2 (released ???)
This release fixes the following regressions identified in 4.1.0: This release fixes the following regressions identified in 4.1.0:
- Fixed spurious error output when completing remote file paths for ``scp`` (:issue:`11860`). - Fixed spurious error output when completing remote file paths for ``scp`` (:issue:`11860`).
- Fixed the :kbd:`alt-l` binding not formatting ``ls`` output correctly (one entry per line, no colors) (:issue:`11888`).
- Fixed an issue where focus events (currently only enabled in ``tmux``) would cause multiline prompts to be redrawn in the wrong line (:issue:`11870`). - Fixed an issue where focus events (currently only enabled in ``tmux``) would cause multiline prompts to be redrawn in the wrong line (:issue:`11870`).
- Stopped printing output that would cause a glitch on old versions of Midnight Commander (:issue:`11869`). - Stopped printing output that would cause a glitch on old versions of Midnight Commander (:issue:`11869`).
- Added a fix for some configurations of Zellij where :kbd:`escape` key processing was delayed (:issue:`11868`). - Added a fix for some configurations of Zellij where :kbd:`escape` key processing was delayed (:issue:`11868`).

3
share/functions/__fish_echo.fish
View File

@@ -10,7 +10,8 @@ set -l erase_line "$(
function __fish_echo --inherit-variable erase_line --description 'run the given command after the current commandline and redraw the prompt' function __fish_echo --inherit-variable erase_line --description 'run the given command after the current commandline and redraw the prompt'
set -l line (commandline --line) set -l line (commandline --line)
string >&2 repeat -N \n --count=(math (commandline | count) - $line + 1) string >&2 repeat -N \n --count=(math (commandline | count) - $line + 1)
printf %s\n $erase_line($argv) >&2 printf %s $erase_line >&2
$argv >&2
string >&2 repeat -N \n --count=(math (count (fish_prompt)) - 1) string >&2 repeat -N \n --count=(math (count (fish_prompt)) - 1)
string >&2 repeat -N \n --count=(math $line - 1) string >&2 repeat -N \n --count=(math $line - 1)
commandline -f repaint commandline -f repaint