From b81a55e5f086e2df33b0a44cf80f02659a4bda8f Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sat, 12 Apr 2025 10:34:31 +0200 Subject: [PATCH] Fix bad conflict resolution --- src/reader.rs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/reader.rs b/src/reader.rs index e00294af6..fb42e7b44 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -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"));