From 7935f6ce35fd65225b2bd6921078ef1036b19ae5 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 20 Jul 2019 08:12:56 -0400
Subject: vim-patch:8.1.0754: preferred column when setting 'cursorcolumn'
 #10549

Problem:    Preferred column is lost when setting 'cursorcolumn'.
Solution:   Change option flag to P_RWINONLY. (Takayuki Kurosawa,
            closes vim/vim#3806)
https://github.com/vim/vim/commit/177ab9e0262b1b3a6120bea655864ead487210e5
---
 src/nvim/options.lua                  |  2 +-
 src/nvim/testdir/test_cursor_func.vim | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index ceff120e4f..3280c92b2d 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -543,7 +543,7 @@ return {
       full_name='cursorcolumn', abbreviation='cuc',
       type='bool', scope={'window'},
       vi_def=true,
-      redraw={'current_window'},
+      redraw={'current_window_only'},
       defaults={if_true={vi=false}}
     },
     {
diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim
index e1b9651c84..6bc9535aaf 100644
--- a/src/nvim/testdir/test_cursor_func.vim
+++ b/src/nvim/testdir/test_cursor_func.vim
@@ -44,3 +44,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
-- 
cgit