From 1647e0a5b306dc6767a5298c8a9281a0fc7ace14 Mon Sep 17 00:00:00 2001 From: Shougo Matsushita Date: Sat, 11 Jul 2020 13:13:49 +0900 Subject: vim-patch:8.1.1564: sign column takes up space Problem: Sign column takes up space. (Adam Stankiewicz) Solution: Optionally put signs in the number column. (Yegappan Lakshmanan, closes vim/vim#4555, closes vim/vim#4515) https://github.com/vim/vim/commit/394c5d8870b15150fc91a4c058dc571fd5eaa97e --- src/nvim/option.c | 1 + src/nvim/screen.c | 2 +- src/nvim/testdir/test_signs.vim | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/option.c b/src/nvim/option.c index 97f31b4754..2862419177 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -7404,6 +7404,7 @@ int win_signcol_count(win_T *wp) int maximum = 1, needed_signcols; const char *scl = (const char *)wp->w_p_scl; + // Note: It checks "no" or "number" in 'signcolumn' option if (*scl == 'n' && (*(scl + 1) == 'o' || (*(scl + 1) == 'u' && (wp->w_p_nu || wp->w_p_rnu)))) { diff --git a/src/nvim/screen.c b/src/nvim/screen.c index fddcedf449..4ca2621b14 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -4477,7 +4477,7 @@ void screen_adjust_grid(ScreenGrid **grid, int *row_off, int *col_off) // If 'nrcol' is TRUE, the sign is going to be displayed in the number column. // Otherwise the sign is going to be displayed in the sign column. static void get_sign_display_info( - int nrcol, + bool nrcol, win_T *wp, linenr_T lnum, int row, diff --git a/src/nvim/testdir/test_signs.vim b/src/nvim/testdir/test_signs.vim index 48a885c0a1..3dad290c94 100644 --- a/src/nvim/testdir/test_signs.vim +++ b/src/nvim/testdir/test_signs.vim @@ -6,6 +6,7 @@ endif source screendump.vim +" Note: In neovim, swapfile feature must be disabled set noswapfile func Test_sign() -- cgit