Merge branch 'nkchanges' into 'master'

Disable modelines as we use securemodelines plugin See merge request !6

Merge branch 'nkchanges' into 'master'
Disable modelines as we use securemodelines plugin See merge request !6
9d4b0b30 · Nigel Kukard · 2386f548 · 2c4c6b67 · 9d4b0b30
Commit 9d4b0b30 authored Jun 09, 2019 by Nigel Kukard
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

vimrc vimrc +3 -2

No files found.
--- a/vimrc
+++ b/vimrc
@@ -93,10 +93,11 @@ set ignorecase
 set showmatch


+"NK: We now use secure modelines plugin, so this should be disabled by default
 " Pull vim settings from end of file
-set modeline
+"set modeline
 " Use 3 lines at bottom of file
-set modelines=3
+"set modelines=3

 " Only support unix filetypes
 set fileformats=unix