diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-08-14 14:49:27 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2019-08-14 14:49:27 +0200 |
| commit | f9f238b21a9659e81e8e84f35e9cf886a5705a3c (patch) | |
| tree | 97ade09bfefcde5c20eb3a88ed7f593d745e6c30 | |
| parent | 5ad67af3c1884cd81a06986c4516c8a210bd7418 (diff) | |
| download | rneovim-f9f238b21a9659e81e8e84f35e9cf886a5705a3c.tar.gz rneovim-f9f238b21a9659e81e8e84f35e9cf886a5705a3c.tar.bz2 rneovim-f9f238b21a9659e81e8e84f35e9cf886a5705a3c.zip | |
api: nvim_win_open() style="minimal" should disable 'foldcolumn'
| -rw-r--r-- | src/nvim/api/vim.c | 8 | ||||
| -rw-r--r-- | src/nvim/window.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/float_spec.lua | 41 |
3 files changed, 27 insertions, 24 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index ed6a28bcda..6280038d1a 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -1071,10 +1071,10 @@ fail: /// disabled. This is useful when displaing a temporary /// float where the text should not be edited. Disables /// 'number', 'relativenumber', 'cursorline', 'cursorcolumn', -/// 'spell' and 'list' options. 'signcolumn' is changed to -/// `auto`. The end-of-buffer region is hidden by setting -/// `eob` flag of 'fillchars' to a space char, and clearing -/// the |EndOfBuffer| region in 'winhighlight'. +/// 'foldcolumn', 'spell' and 'list' options. 'signcolumn' +/// is changed to `auto`. The end-of-buffer region is hidden +/// by setting `eob` flag of 'fillchars' to a space char, +/// and clearing the |EndOfBuffer| region in 'winhighlight'. /// /// top-level window. Currently accepts no other positioning /// configuration together with this. diff --git a/src/nvim/window.c b/src/nvim/window.c index 22a8969b88..4173245439 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -598,6 +598,7 @@ void win_set_minimal_style(win_T *wp) wp->w_p_cuc = false; wp->w_p_spell = false; wp->w_p_list = false; + wp->w_p_fdc = 0; // Hide EOB region: use " " fillchar and cleared highlighting if (wp->w_p_fcs_chars.eob != ' ') { @@ -615,6 +616,7 @@ void win_set_minimal_style(win_T *wp) xfree(old); } + // signcolumn: use 'auto' if (wp->w_p_scl[0] != 'a') { xfree(wp->w_p_scl); wp->w_p_scl = (char_u *)xstrdup("auto"); diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua index 8a1758c4a0..3e77349843 100644 --- a/test/functional/ui/float_spec.lua +++ b/test/functional/ui/float_spec.lua @@ -383,6 +383,7 @@ describe('floating windows', function() command('set number') command('set signcolumn=yes') command('set cursorline') + command('set foldcolumn=1') command('hi NormalFloat guibg=#333333') feed('ix<cr>y<cr><esc>gg') local win = meths.open_win(0, false, {relative='editor', width=20, height=4, row=4, col=10, style='minimal'}) @@ -397,9 +398,9 @@ describe('floating windows', function() [2:----------------------------------------]| | ## grid 2 - {19: }{20: 1 }{21:^x }| - {19: }{14: 2 }y | - {19: }{14: 3 } | + {19: }{20: 1 }{21:^x }| + {19: }{14: 2 }y | + {19: }{14: 3 } | {0:~ }| {0:~ }| {0:~ }| @@ -410,15 +411,15 @@ describe('floating windows', function() {15: }| ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} else - screen:expect([[ - {19: }{20: 1 }{21:^x }| - {19: }{14: 2 }y | - {19: }{14: 3 } {15:x } | + screen:expect{grid=[[ + {19: }{20: 1 }{21:^x }| + {19: }{14: 2 }y | + {19: }{14: 3 } {15:x } | {0:~ }{15:y }{0: }| {0:~ }{15: }{0: }| {0:~ }{15: }{0: }| | - ]]) + ]]} end -- signcolumn=yes still works if there actually are signs @@ -435,9 +436,9 @@ describe('floating windows', function() [2:----------------------------------------]| | ## grid 2 - {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20: 1 }{21:^x }| - {19: }{14: 2 }y | - {19: }{14: 3 } | + {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20: 1 }{21:^x }| + {19: }{14: 2 }y | + {19: }{14: 3 } | {0:~ }| {0:~ }| {0:~ }| @@ -450,9 +451,9 @@ describe('floating windows', function() else screen:expect([[ - {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20: 1 }{21:^x }| - {19: }{14: 2 }y | - {19: }{14: 3 } {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{15:x } | + {19: }{17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{20: 1 }{21:^x }| + {19: }{14: 2 }y | + {19: }{14: 3 } {17:𐌢̀́̂̃̅̄𐌢̀́̂̃̅̄}{15:x } | {0:~ }{19: }{15:y }{0: }| {0:~ }{19: }{15: }{0: }| {0:~ }{15: }{0: }| @@ -474,9 +475,9 @@ describe('floating windows', function() [2:----------------------------------------]| | ## grid 2 - {19: }{20: 1 }{21:^x }| - {19: }{14: 2 }y | - {19: }{14: 3 } | + {19: }{20: 1 }{21:^x }| + {19: }{14: 2 }y | + {19: }{14: 3 } | {0:~ }| {0:~ }| {0:~ }| @@ -488,9 +489,9 @@ describe('floating windows', function() ]], float_pos={[3] = {{id = 1001}, "NW", 1, 4, 10, true}}} else screen:expect([[ - {19: }{20: 1 }{21:^x }| - {19: }{14: 2 }y | - {19: }{14: 3 } {15: } | + {19: }{20: 1 }{21:^x }| + {19: }{14: 2 }y | + {19: }{14: 3 } {15: } | {0:~ }{15: }{0: }| {0:~ }{15: }{0: }| {0:~ }{15: }{0: }| |