From ac37f00a6b1ed6821eb30657b8dcf235f473c08d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 20 Jun 2018 23:13:11 +1200 Subject: Restructure indent settings in .vimrc --- vim/vimrc | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 49f1194b..d2ae653a 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -231,22 +231,12 @@ if has('virtualedit') set virtualedit+=block endif -" Adopt the indent of the last line on new lines -set autoindent - -" Use spaces instead of tabs -set expandtab - -" Indent with four spaces when an indent operation is used -set shiftwidth=4 - -" Insert four spaces when Tab is pressed -set softtabstop=4 - -" When indenting lines with < or >, round the indent to a multiple of -" 'shiftwidth', so even if the line is indented by one space it will indent -" up to 4 and down to 0, for example -set shiftround +" The all-important default indent settings; filetypes to tweak +set autoindent " Use indent of previous line on new lines +set expandtab " Use spaces instead of tabs +set shiftround " Round indenting to multiples of 4 +set shiftwidth=4 " Indent with four spaces +set softtabstop=4 " Insert four spaces for a Tab press " Don't join lines with two spaces at the end of sentences; I don't two-space, " despite the noble Steve Losh's exhortations -- cgit v1.2.3