From c3b2cf6b18d1ae408ff7f0eb685bf4a2281f39bf Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 10 Nov 2017 13:19:54 +1300
Subject: Merge join,indent.vim into whitespace.vim

---
 vim/config/indent.vim     | 21 ---------------------
 vim/config/join.vim       | 10 ----------
 vim/config/whitespace.vim | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 vim/config/indent.vim
 delete mode 100644 vim/config/join.vim

diff --git a/vim/config/indent.vim b/vim/config/indent.vim
deleted file mode 100644
index aba4bbf7..00000000
--- a/vim/config/indent.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-" Adopt the indent of the last line on new lines; interestingly, plugins that
-" do clever things with indenting will often assume this is set
-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
-
-" Indent intelligently to 'shiftwidth' at the starts of lines with Tab, but
-" use 'tabstop' everywhere else
-set smarttab
-
-" 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
diff --git a/vim/config/join.vim b/vim/config/join.vim
deleted file mode 100644
index ebf42a8b..00000000
--- a/vim/config/join.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-" Don't join lines with two spaces at the end of sentences; I don't two-space,
-" despite the noble Steve Losh's exhortations
-set nojoinspaces
-
-" Rebind normal J to run plugin-defined join that doesn't jump around, but
-" only if we have the eval feature, because otherwise this mapping won't exist
-" and we should keep the default behaviour
-if has('eval')
-  nmap J <Plug>FixedJoin
-endif
diff --git a/vim/config/whitespace.vim b/vim/config/whitespace.vim
index 24cda107..12d41a4e 100644
--- a/vim/config/whitespace.vim
+++ b/vim/config/whitespace.vim
@@ -1,2 +1,35 @@
+" Adopt the indent of the last line on new lines; interestingly, plugins that
+" do clever things with indenting will often assume this is set
+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
+
+" Indent intelligently to 'shiftwidth' at the starts of lines with Tab, but
+" use 'tabstop' everywhere else
+set smarttab
+
+" 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
+
+" Don't join lines with two spaces at the end of sentences; I don't two-space,
+" despite the noble Steve Losh's exhortations
+set nojoinspaces
+
+" Rebind normal J to run plugin-defined join that doesn't jump around, but
+" only if we have the eval feature, because otherwise this mapping won't exist
+" and we should keep the default behaviour
+if has('eval')
+  nmap J <Plug>FixedJoin
+endif
+
 " \x strips trailing whitespace via a custom plugin
 nmap <Leader>x <Plug>StripTrailingWhitespace
-- 
cgit v1.2.3