From 93f218b69a7cb2138b2e1a9bab193b2b2d1377e2 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 7 Sep 2018 17:24:56 +1200
Subject: Unset 'laststatus' and 'ruler' only if they're set

---
 vim/vimrc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index eb7f04d3..9f5735c7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -140,7 +140,9 @@ set nojoinspaces
 
 " Don't show a statusline if there's only one window
 " This is the Vim default, but NeoVim changed it
-set laststatus=1
+if &laststatus
+  set laststatus=1
+endif
 
 " Don't redraw the screen during batch execution
 set lazyredraw
@@ -167,7 +169,9 @@ set path+=**            " Search current directory's whole tree
 
 " Disable command line display of file position
 " This is the Vim default, but NeoVim changed it
-set noruler
+if &ruler
+  set noruler
+endif
 
 " Make sessions usable
 if exists('+sessionoptions')
-- 
cgit v1.2.3