From a9359dca3794754ac3d4caff1bb86fe5d4dad547 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 22 Mar 2022 07:05:06 +0800
Subject: [PATCH] fix(float): make laststatus=1 behave consistently with
 floating windows

---
 src/nvim/window.c                 | 2 +-
 test/functional/ui/float_spec.lua | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/nvim/window.c b/src/nvim/window.c
index 7df22c16d3..bcc7a92b33 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6507,7 +6507,7 @@ char_u *file_name_in_line(char_u *line, int col, int options, long count, char_u
 void last_status(bool morewin)
 {
   // Don't make a difference between horizontal or vertical split.
-  last_status_rec(topframe, (p_ls == 2 || (p_ls == 1 && (morewin || !one_window(curwin)))),
+  last_status_rec(topframe, (p_ls == 2 || (p_ls == 1 && (morewin || !one_nonfloat()))),
                   global_stl_height() > 0);
 }
 
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index 18916b70db..7192b95e45 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -5729,7 +5729,7 @@ describe('float window', function()
             [2:----------------------------------------]|
             [2:----------------------------------------]|
             [2:----------------------------------------]|
-            {5:[No Name] [+]                           }|
+            [2:----------------------------------------]|
             [3:----------------------------------------]|
           ## grid 2
             x                                       |
@@ -5737,6 +5737,7 @@ describe('float window', function()
             {0:~                                       }|
             {0:~                                       }|
             {0:~                                       }|
+            {0:~                                       }|
           ## grid 3
             :quit                                   |
           ## grid 4
@@ -5752,7 +5753,7 @@ describe('float window', function()
             {0:~    }{1:^y                   }{0:               }|
             {0:~    }{2:~                   }{0:               }|
             {0:~                                       }|
-            {5:[No Name] [+]                           }|
+            {0:~                                       }|
             :quit                                   |
           ]])
         end