From a0739369974f5f5edf0305d65b1e4b20cc26f8a8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 15 Sep 2021 16:57:30 +0530
Subject: [PATCH] Fish shell integration: Strip trailing newlines from the
 original fish prompt as fish does this

---
 shell-integration/kitty.fish | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell-integration/kitty.fish b/shell-integration/kitty.fish
index d08d41915..6861abd5b 100644
--- a/shell-integration/kitty.fish
+++ b/shell-integration/kitty.fish
@@ -60,7 +60,8 @@ function _ksi_main
 
         function _ksi_end_prompt
             set --local cmd_status "$status"
-            _ksi_original_fish_prompt
+            set --local op (_ksi_original_fish_prompt)  # trim trailing newlines to mimic fish behavior
+            printf "%s" "$op"
             set --global _ksi_prompt_state "prompt_end"
             _ksi_mark "B"
             return "$cmd_status" # preserve the value of $status