diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-03-22 07:05:06 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-03-23 09:07:21 +0800 |
| commit | a9359dca3794754ac3d4caff1bb86fe5d4dad547 (patch) | |
| tree | 7a26bb3c9d0cd42f772afd7e2d4ded677c49c01c | |
| parent | 3fdb7b528d9d066ccce8b1cb5d2225c338acfbb8 (diff) | |
| download | rneovim-a9359dca3794754ac3d4caff1bb86fe5d4dad547.tar.gz rneovim-a9359dca3794754ac3d4caff1bb86fe5d4dad547.tar.bz2 rneovim-a9359dca3794754ac3d4caff1bb86fe5d4dad547.zip | |
fix(float): make laststatus=1 behave consistently with floating windows
| -rw-r--r-- | src/nvim/window.c | 2 | ||||
| -rw-r--r-- | 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 |