aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-20 23:13:11 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-20 23:13:11 +1200
commitac37f00a6b1ed6821eb30657b8dcf235f473c08d (patch)
treeaa2dbcd1407b2b3919235c4204370ef123c94e97
parent10a49511325c57bbc5e08ce4d550a68b261e2c29 (diff)
downloaddotfiles-ac37f00a6b1ed6821eb30657b8dcf235f473c08d.tar.gz
Restructure indent settings in .vimrc
-rw-r--r--vim/vimrc22
1 files 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