h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-28 01:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad conflict resolution

Browse Source
This commit is contained in:
Johannes Altmanninger
2025-04-12 10:34:31 +02:00
parent 6fcb418ae3
commit b81a55e5f0
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/reader.rs
View File

@@ -3853,17 +3853,6 @@ fn clear_screen_and_repaint(&mut self) {
self.screen.reset_line(/*repaint_prompt=*/ true);
self.layout_and_repaint(L!("readline"));
// Clear the screen.
// This is subtle: We first clear, draw the old prompt,
// and *then* reexecute the prompt and overdraw it.
// This removes the flicker,
// while keeping the prompt up-to-date.
Outputter::stdoutput()
.borrow_mut()
.write_command(ClearScreen);
self.screen.reset_line(/*repaint_prompt=*/ true);
self.layout_and_repaint(L!("readline"));
self.exec_prompt();
self.screen.reset_line(/*repaint_prompt=*/ true);
self.layout_and_repaint(L!("readline"));