diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-01-01 15:12:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-01 15:12:33 -0500 |
| commit | c5f4b92ff93a40ec4e77b78d0576903e7a60eefd (patch) | |
| tree | d4bdbc55eec66541aa95a03adff0403d6ab71685 /src/nvim/move.c | |
| parent | 57ce8b56488a781088cb503f0da723f59e2f9554 (diff) | |
| parent | 46235a30edc4ee09fdbd4f489865982bafde247d (diff) | |
| download | rneovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd.tar.gz rneovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd.tar.bz2 rneovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd.zip | |
Merge pull request #5613 from jamessan/vim-7.4.2183
vim-patch:7.4.2183,7.4.2194,7.4.2201,7.4.2204,0952131,7.4.2215,7.4.2225,7.4.2226,7.4.2272,7.4.2273,7.4.2277,7.4.2294
Diffstat (limited to 'src/nvim/move.c')
| -rw-r--r-- | src/nvim/move.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 4c814f3ae0..bb6c032db1 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -24,6 +24,7 @@ #include "nvim/mbyte.h" #include "nvim/memline.h" #include "nvim/misc1.h" +#include "nvim/option.h" #include "nvim/popupmnu.h" #include "nvim/screen.h" #include "nvim/strings.h" @@ -669,8 +670,7 @@ int win_col_off(win_T *wp) return ((wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) + 1 : 0) + (cmdwin_type == 0 || wp != curwin ? 0 : 1) + (int)wp->w_p_fdc - + (wp->w_buffer->b_signlist != NULL ? 2 : 0) - ; + + (signcolumn_on(wp) ? 2 : 0); } int curwin_col_off(void) |