fix(terminal): restore options properly when switching buffer (#37485)

test/functional/terminal/buffer_spec.lua

@@ -33,21 +33,35 @@ describe(':terminal buffer', function()
   end)
 
   it('terminal-mode forces various options', function()
+    local expr =
+      '[&l:cursorlineopt, &l:cursorline, &l:cursorcolumn, &l:scrolloff, &l:sidescrolloff]'
+
     feed([[<C-\><C-N>]])
     command('setlocal cursorline cursorlineopt=both cursorcolumn scrolloff=4 sidescrolloff=7')
-    eq(
-      { 'both', 1, 1, 4, 7 },
-      eval('[&l:cursorlineopt, &l:cursorline, &l:cursorcolumn, &l:scrolloff, &l:sidescrolloff]')
-    )
+    eq({ 'both', 1, 1, 4, 7 }, eval(expr))
     eq('nt', eval('mode(1)'))
 
-    -- Enter terminal-mode ("insert" mode in :terminal).
+    -- Enter Terminal mode ("insert" mode in :terminal).
     feed('i')
     eq('t', eval('mode(1)'))
-    eq(
-      { 'number', 1, 0, 0, 0 },
-      eval('[&l:cursorlineopt, &l:cursorline, &l:cursorcolumn, &l:scrolloff, &l:sidescrolloff]')
-    )
+    eq({ 'number', 1, 0, 0, 0 }, eval(expr))
+
+    -- Return to Normal mode.
+    feed([[<C-\><C-N>]])
+    eq('nt', eval('mode(1)'))
+    eq({ 'both', 1, 1, 4, 7 }, eval(expr))
+
+    -- Enter Terminal mode again.
+    feed('i')
+    eq('t', eval('mode(1)'))
+    eq({ 'number', 1, 0, 0, 0 }, eval(expr))
+
+    -- Delete the terminal buffer and return to the previous buffer.
+    command('bwipe!')
+    feed('<Ignore>') -- Add input to separate two RPC requests
+    eq('n', eval('mode(1)'))
+    -- Window options in the old buffer should be unchanged. #37484
+    eq({ 'both', 0, 0, -1, -1 }, eval(expr))
   end)
 
   it('terminal-mode does not change cursorlineopt if cursorline is disabled', function()

test/functional/terminal/window_spec.lua

@@ -436,7 +436,7 @@ describe(':terminal window', function()
       file foo
       setlocal cursorline
       vsplit
-      setlocal nocursorline cursorcolumn
+      setlocal nocursorline cursorcolumn cursorlineopt=number
     ]])
     screen:expect([[
       {19:t}ty ready                │tty ready               |
@@ -580,6 +580,49 @@ describe(':terminal window', function()
       {7:[No Name]                 }{18:foo [-]                 }|
                                                         |
     ]])
+
+    command('wincmd l | enew | setlocal cursorline nocursorcolumn')
+    screen:expect([[
+      {1: }{5:2}{1: [No Name] }{2: foo }{4:                               }{2:X}|
+                               │{12:^                        }|
+      {6:~                        }│{6:~                       }|*3
+      {4:[No Name]                 }{7:[No Name]               }|
+                                                        |
+    ]])
+    command('buffer # | startinsert')
+    screen:expect([[
+      {1: }{5:2}{1: foo }{2: foo }{4:                                     }{2:X}|
+                               │rows: 5, cols: 25       |
+      {6:~                        }│rows: 5, cols: 50       |
+      {6:~                        }│^                        |
+      {6:~                        }│                        |
+      {4:[No Name]                 }{17:foo [-]                 }|
+      {1:-- TERMINAL --}                                    |
+    ]])
+    -- Switching to another buffer shouldn't change window options there. #37484
+    command('buffer # | call setline(1, ["aaa", "bbb", "ccc"]) | normal! jl')
+    screen:expect([[
+      {1: }{5:2}{1:+ [No Name] }{2: foo }{4:                              }{2:X}|
+                               │aaa                     |
+      {6:~                        }│{12:b^bb                     }|
+      {6:~                        }│ccc                     |
+      {6:~                        }│{6:~                       }|
+      {4:[No Name]                 }{7:[No Name] [+]           }|
+                                                        |
+    ]])
+    -- Window options are restored when switching back to the terminal buffer.
+    command('buffer #')
+    screen:expect([[
+      {1: }{5:2}{1: foo }{2: foo }{4:                                     }{2:X}|
+                               │{19:r}ows: 5, cols: 25       |
+      {6:~                        }│{19:r}ows: 5, cols: 50       |
+      {6:~                        }│^                        |
+      {6:~                        }│{19: }                       |
+      {4:[No Name]                 }{17:foo [-]                 }|
+                                                        |
+    ]])
+    -- 'cursorlineopt' should still be "number".
+    eq('number', eval('&l:cursorlineopt'))
   end)
 
   it('not unnecessarily redrawn by events', function()