diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-15 21:12:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-15 21:12:57 +0100 |
| commit | 177ab9e0262b1b3a6120bea655864ead487210e5 (patch) | |
| tree | 8a5bdc8635e9a0c06d68c61d7725ee8405156ba4 | |
| parent | b5443cc46dd1485d6c785dd8c65a2c07bd5a17f3 (diff) | |
| download | vim-git-177ab9e0262b1b3a6120bea655864ead487210e5.tar.gz | |
patch 8.1.0754: preferred column is lost when setting 'cursorcolumn'v8.1.0754
Problem: Preferred column is lost when setting 'cursorcolumn'.
Solution: Change option flag to P_RWINONLY. (Takayuki Kurosawa,
closes #3806)
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_cursor_func.vim | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index 414e65a1f..ca3e3d830 100644 --- a/src/option.c +++ b/src/option.c @@ -989,7 +989,7 @@ static struct vimoption options[] = {"cursorbind", "crb", P_BOOL|P_VI_DEF, (char_u *)VAR_WIN, PV_CRBIND, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, - {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN, + {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWINONLY, #ifdef FEAT_SYN_HL (char_u *)VAR_WIN, PV_CUC, #else diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim index d784e3678..a41cc7d00 100644 --- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -46,3 +46,23 @@ func Test_curswant_with_autocommand() quit! endfunc +" Tests for behavior of curswant with cursorcolumn/line +func Test_curswant_with_cursorcolumn() + new + call setline(1, ['01234567', '']) + exe "normal! ggf6j" + call assert_equal(6, winsaveview().curswant) + set cursorcolumn + call assert_equal(6, winsaveview().curswant) + quit! +endfunc + +func Test_curswant_with_cursorline() + new + call setline(1, ['01234567', '']) + exe "normal! ggf6j" + call assert_equal(6, winsaveview().curswant) + set cursorline + call assert_equal(6, winsaveview().curswant) + quit! +endfunc diff --git a/src/version.c b/src/version.c index 708f96f9c..cf5860567 100644 --- a/src/version.c +++ b/src/version.c @@ -796,6 +796,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 754, +/**/ 753, /**/ 752, |