From 7229493eb171138b850404d486ccbe2943d0c497 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 9 Feb 2018 02:25:03 +0100
Subject: test/oldtest: move Nvim setup to testdir/setup.vim

---
 src/nvim/testdir/runtest.vim | 11 -----------
 src/nvim/testdir/setup.vim   | 11 ++++++++---
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 4de1345679..01ba8baf02 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -62,20 +62,9 @@ lang mess C
 " Always use forward slashes.
 set shellslash
 
-" Make sure $HOME does not get read or written.
-let $HOME = '/does/not/exist'
-
 " Prepare for calling garbagecollect_for_testing().
 let v:testing = 1
 
-" Align Nvim defaults to Vim.
-set directory^=.
-set backspace=
-set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd
-set listchars=eol:$
-" Prevent Nvim log from writing to stderr.
-let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log'
-
 func RunTheTest(test)
   echo 'Executing ' . a:test
   if exists("*SetUp")
diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim
index a4874a4c96..87cf1f6163 100644
--- a/src/nvim/testdir/setup.vim
+++ b/src/nvim/testdir/setup.vim
@@ -1,9 +1,14 @@
 " Common preparations for running tests.
 
-set noruler
-set noshowcmd
-set belloff=
+" Align Nvim defaults to Vim.
 set sidescroll=0
+set directory^=.
+set backspace=
+set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd
+set listchars=eol:$
+" Prevent Nvim log from writing to stderr.
+let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log'
+
 
 " Make sure 'runtimepath' and 'packpath' does not include $HOME.
 set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
-- 
cgit