Merge pull request #9143 from bfredl/nuclear

disable clearing almost everywhere, cleanup screen.c dead code

6 files changed, 21 insertions, 22 deletions

diff --git a/test/functional/eval/input_spec.lua b/test/functional/eval/input_spec.lua
index 82e75d7a8e..8c65297ac6 100644
--- a/test/functional/eval/input_spec.lua
+++ b/test/functional/eval/input_spec.lua
@@ -149,7 +149,7 @@ describe('input()', function()
       {EOB:~                        }|
       {T:Foo>}Bar^                  |
     ]])
-    command('redraw!')
+    command('mode')
     screen:expect{grid=[[
                                |
       {EOB:~                        }|
@@ -165,7 +165,7 @@ describe('input()', function()
       {EOB:~                        }|
       {T:Foo>}Ba^                   |
     ]])
-    command('redraw!')
+    command('mode')
     screen:expect{grid=[[
                                |
       {EOB:~                        }|
@@ -347,7 +347,7 @@ describe('inputdialog()', function()
       {EOB:~                        }|
       {T:Foo>}Bar^                  |
     ]])
-    command('redraw!')
+    command('mode')
     screen:expect{grid=[[
                                |
       {EOB:~                        }|
@@ -363,7 +363,7 @@ describe('inputdialog()', function()
       {EOB:~                        }|
       {T:Foo>}Ba^                   |
     ]])
-    command('redraw!')
+    command('mode')
     screen:expect{grid=[[
                                |
       {EOB:~                        }|
diff --git a/test/functional/ui/cmdline_highlight_spec.lua b/test/functional/ui/cmdline_highlight_spec.lua
index 2eab44dc90..1568b7816e 100644
--- a/test/functional/ui/cmdline_highlight_spec.lua
+++ b/test/functional/ui/cmdline_highlight_spec.lua
@@ -32,7 +32,7 @@ before_each(function()
     highlight RBP4 guibg=Blue
     let g:NUM_LVLS = 4
     function Redraw()
-      redraw!
+      mode
       return ''
     endfunction
     let g:id = ''
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index e86414fe5f..0ebb62f78f 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -253,7 +253,7 @@ local function test_cmdline(linegrid)
     ]], cmdline=expectation}
 
     -- erase information, so we check if it is retransmitted
-    command("redraw!")
+    command("mode")
     screen:expect{grid=[[
       ^                         |
       {1:~                        }|
@@ -320,7 +320,7 @@ local function test_cmdline(linegrid)
       {{'  line1'}},
     }}
 
-    command("redraw!")
+    command("mode")
     screen:expect{grid=[[
       ^                         |
       {1:~                        }|
@@ -411,7 +411,7 @@ local function test_cmdline(linegrid)
       pos = 4,
     }}}
 
-    command("redraw!")
+    command("mode")
     screen:expect{grid=[[
                                |
       {2:[No Name]                }|
@@ -435,9 +435,9 @@ local function test_cmdline(linegrid)
 
     feed("<c-c>")
     screen:expect{grid=[[
-                               |
+      ^                         |
       {2:[No Name]                }|
-      {1::}make^                    |
+      {1::}make                    |
       {3:[Command Line]           }|
                                |
     ]], cmdline={{
@@ -446,7 +446,6 @@ local function test_cmdline(linegrid)
       pos = 4,
     }}}
 
-    screen.cmdline = {}
     command("redraw!")
     screen:expect{grid=[[
       ^                         |
diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua
index 9c5a59b58d..39a5c10bb7 100644
--- a/test/functional/ui/fold_spec.lua
+++ b/test/functional/ui/fold_spec.lua
@@ -65,7 +65,7 @@ describe("folded lines", function()
       {1:~                                            }|
       {1:~                                            }|
       {1:~                                            }|
-                                                   |
+      :set noarabicshape                           |
     ]])
 
     feed_command("set number foldcolumn=2")
@@ -114,7 +114,7 @@ describe("folded lines", function()
       {1:                                            ~}|
       {1:                                            ~}|
       {1:                                            ~}|
-                                                   |
+      :set arabicshape                             |
     ]])
 
     feed('zo')
@@ -126,7 +126,7 @@ describe("folded lines", function()
       {1:                                            ~}|
       {1:                                            ~}|
       {1:                                            ~}|
-                                                   |
+      :set arabicshape                             |
     ]])
 
     feed_command('set noarabicshape')
@@ -138,7 +138,7 @@ describe("folded lines", function()
       {1:                                            ~}|
       {1:                                            ~}|
       {1:                                            ~}|
-                                                   |
+      :set noarabicshape                           |
     ]])
 
   end)
diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 50df3c3606..55fc343e4c 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -122,7 +122,7 @@ describe('highlight defaults', function()
       {0:~                                                    }|
       {0:~                                                    }|
       {2:[No Name]                                            }|
-                                                           |
+      :vsp                                                 |
     ]])
     -- navigate to verify that the attributes are properly moved
     feed('<c-w>j')
@@ -140,7 +140,7 @@ describe('highlight defaults', function()
       {0:~                                                    }|
       {0:~                                                    }|
       {1:[No Name]                                            }|
-                                                           |
+      :vsp                                                 |
     ]])
     -- note that when moving to a window with small width nvim will increase
     -- the width of the new active window at the expense of a inactive window
@@ -160,7 +160,7 @@ describe('highlight defaults', function()
       {0:~                                                    }|
       {0:~                                                    }|
       {2:[No Name]                                            }|
-                                                           |
+      :vsp                                                 |
     ]])
     feed('<c-w>l')
     screen:expect([[
@@ -177,7 +177,7 @@ describe('highlight defaults', function()
       {0:~                                                    }|
       {0:~                                                    }|
       {2:[No Name]                                            }|
-                                                           |
+      :vsp                                                 |
     ]])
     feed('<c-w>h<c-w>h')
     screen:expect([[
@@ -194,7 +194,7 @@ describe('highlight defaults', function()
       {0:~                                                    }|
       {0:~                                                    }|
       {2:[No Name]                                            }|
-                                                           |
+      :vsp                                                 |
     ]])
   end)
 
diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua
index ff395adeb9..c531f838c1 100644
--- a/test/functional/ui/mouse_spec.lua
+++ b/test/functional/ui/mouse_spec.lua
@@ -530,7 +530,7 @@ describe('ui/mouse/input', function()
       mouse                    |
       support and selectio^n    |
       {0:~                        }|
-                               |
+      :tabprevious             |
     ]])
     feed('<LeftMouse><10,0><LeftRelease>')  -- go to second tab
     helpers.wait()
@@ -540,7 +540,7 @@ describe('ui/mouse/input', function()
       ^this is bar              |
       {0:~                        }|
       {0:~                        }|
-                               |
+      :tabprevious             |
     ]])
     feed('<LeftDrag><4,1>')
     screen:expect([[