From 44d807167f1cf122e83e4a9b7c5c15409ab3d96d Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 10 Nov 2017 21:41:52 +1300
Subject: Rearrange three smaller files into display.vim

---
 vim/config/display.vim  | 16 ++++++++++++++++
 vim/config/list.vim     | 10 ----------
 vim/config/messages.vim |  3 ---
 vim/config/number.vim   |  5 -----
 vim/config/wrap.vim     |  4 ++++
 5 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 vim/config/display.vim
 delete mode 100644 vim/config/list.vim
 delete mode 100644 vim/config/messages.vim
 delete mode 100644 vim/config/number.vim

diff --git a/vim/config/display.vim b/vim/config/display.vim
new file mode 100644
index 00000000..bb160915
--- /dev/null
+++ b/vim/config/display.vim
@@ -0,0 +1,16 @@
+" Don't show the Vim startup message, I have registered Vim and donated to
+" Uganda
+set shortmess+=I
+
+" Don't show whitespace characters or end-of-line characters visually by
+" default, but make \l toggle between them
+set nolist
+nnoremap <silent>
+      \ <Leader>l
+      \ :<C-U>setlocal list! list?<CR>
+
+" Don't show line numbers by default, but \n toggles them
+set nonumber
+nnoremap <silent>
+      \ <Leader>n
+      \ :<C-U>setlocal number! number?<CR>
diff --git a/vim/config/list.vim b/vim/config/list.vim
deleted file mode 100644
index 1cb4345b..00000000
--- a/vim/config/list.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-" Don't show whitespace characters or end-of-line characters visually by
-" default, but make \l toggle between them
-set nolist
-nnoremap <silent>
-      \ <Leader>l
-      \ :<C-U>setlocal list! list?<CR>
-
-" Clearly show when the start or end of the row does not correspond to the
-" start and end of the line
-set listchars+=precedes:<,extends:>
diff --git a/vim/config/messages.vim b/vim/config/messages.vim
deleted file mode 100644
index b99bebe1..00000000
--- a/vim/config/messages.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-" Don't show the Vim startup message, I have registered Vim and donated to
-" Uganda
-set shortmess+=I
diff --git a/vim/config/number.vim b/vim/config/number.vim
deleted file mode 100644
index becc20f1..00000000
--- a/vim/config/number.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Don't show line numbers by default, but \n toggles them
-set nonumber
-nnoremap <silent>
-      \ <Leader>n
-      \ :<C-U>setlocal number! number?<CR>
diff --git a/vim/config/wrap.vim b/vim/config/wrap.vim
index 51e9ea89..8c7829ba 100644
--- a/vim/config/wrap.vim
+++ b/vim/config/wrap.vim
@@ -9,6 +9,10 @@ nnoremap <silent>
 " column with @ symbols instead, which I don't find very helpful
 set display=lastline
 
+" Clearly show when the start or end of the row does not correspond to the
+" start and end of the line
+set listchars+=precedes:<,extends:>
+
 " When wrapping, j and k should move by screen row, and not to the same
 " column number in the previous logical line, which feels very clumsy and is
 " seldom particularly helpful; you can use n| to jump to the nth column in a
-- 
cgit v1.2.3