diff options
| author | Marco Hinz <mh.codebro+github@gmail.com> | 2019-03-22 17:17:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 17:17:33 +0100 |
| commit | 3edf7fc64f6735a283af2c6cf728b28179bcb582 (patch) | |
| tree | a18de222f2de430888076126013c965842d98007 | |
| parent | fa6ed5f7594b6da25d49f10347e4975329a59a08 (diff) | |
| download | rneovim-3edf7fc64f6735a283af2c6cf728b28179bcb582.tar.gz rneovim-3edf7fc64f6735a283af2c6cf728b28179bcb582.tar.bz2 rneovim-3edf7fc64f6735a283af2c6cf728b28179bcb582.zip | |
api: ignore floating windows for laststatus=1 (#9771)
ONE_WINDOW considers all windows whereas one_window() ignores floating windows.
Fixes https://github.com/neovim/neovim/issues/9768
| -rw-r--r-- | src/nvim/window.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/float_spec.lua | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 609d8f1b4f..e60cfbfb92 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5788,7 +5788,7 @@ last_status ( { /* Don't make a difference between horizontal or vertical split. */ last_status_rec(topframe, (p_ls == 2 - || (p_ls == 1 && (morewin || !ONE_WINDOW)))); + || (p_ls == 1 && (morewin || !one_window())))); } static void last_status_rec(frame_T *fr, int statusline) diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index d18d91de56..4477573cff 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -209,7 +209,7 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {4:[No Name] [+] }| + [2:----------------------------------------]| | ## grid 2 {14: 1 }^x | @@ -217,6 +217,7 @@ describe('floating windows', function() {14: 3 } | {0:~ }| {0:~ }| + {0:~ }| ## grid 3 {15: }| {16:~ }| @@ -230,7 +231,7 @@ describe('floating windows', function() {14: 3 } {15: } | {0:~ }{16:~ }{0: }| {0:~ }{16:~ }{0: }| - {4:[No Name] }{16:~ }{4: }| + {0:~ }{16:~ }{0: }| | ]]) end @@ -3169,13 +3170,14 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {4:[No Name] [+] }| + [2:----------------------------------------]| :tabnext | ## grid 2 ^x | {0:~ }| {0:~ }| {0:~ }| + {0:~ }| ## grid 3 {1:y }| {2:~ }| @@ -3193,7 +3195,7 @@ describe('floating windows', function() {0:~ }{1:y }{0: }| {0:~ }{2:~ }{0: }| {0:~ }| - {4:[No Name] [+] }| + {0:~ }| :tabnext | ]]) end @@ -3214,6 +3216,7 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + {0:~ }| ## grid 3 {1:y }| {2:~ }| @@ -3282,13 +3285,14 @@ describe('floating windows', function() [2:----------------------------------------]| [2:----------------------------------------]| [2:----------------------------------------]| - {4:[No Name] [+] }| + [2:----------------------------------------]| :tabnext | ## grid 2 ^x | {0:~ }| {0:~ }| {0:~ }| + {0:~ }| ## grid 3 y | {0:~ }| @@ -3310,13 +3314,14 @@ describe('floating windows', function() [4:----------------------------------------]| [4:----------------------------------------]| [4:----------------------------------------]| - {4:[No Name] }| + [4:----------------------------------------]| :tabnext | ## grid 2 x | {0:~ }| {0:~ }| {0:~ }| + {0:~ }| ## grid 3 y | {0:~ }| @@ -3325,6 +3330,7 @@ describe('floating windows', function() {0:~ }| {0:~ }| {0:~ }| + {0:~ }| ]], float_pos=expected_pos} end end) |