From 5052da3068b95aa03cb00db9905798db8e323e4f Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 5 Jul 2018 22:43:28 +1200
Subject: Disable 'shiftround' in Vim for a while

After experimenting, I suspect it's actually causing more grief than it
saves.
---
 vim/vimrc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 4b2803fe..361c049e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -34,7 +34,6 @@ endif
 " 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 'shiftwidth'
 set shiftwidth=4  " Indent with four spaces
 
 " Spaces to insert on Tab key insert
-- 
cgit v1.2.3


From 36f86684f4645c171e3d6fbf072aaafe11eaa6c1 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 6 Jul 2018 00:49:16 +1200
Subject: Add \k, \q, and \y .vimrc mappings

Using all of the lowercase alphabet now.
---
 vim/vimrc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 361c049e..fe7e3a6c 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -238,6 +238,8 @@ nnoremap <Bslash>h :<C-U>set hlsearch! hlsearch?<CR>
 nnoremap <Bslash>i :<C-U>set incsearch! incsearch?<CR>
 " \j jumps to buffers (jetpack)
 nnoremap <Bslash>j :<C-U>buffers<CR>:buffer<Space>
+" \k shows my marks
+nnoremap <Bslash>k :<C-U>marks<CR>
 " \l toggles showing tab, end-of-line, and trailing whitespace
 nnoremap <Bslash>l :<C-U>set list! list?<CR>
 " \m shows all maps
@@ -252,6 +254,8 @@ nmap <Bslash>o <Plug>PasteOpenBelow
 nmap <Bslash>O <Plug>PasteOpenAbove
 " \p toggles paste mode
 nnoremap <Bslash>p :<C-U>set paste! paste?<CR>
+" \q formats the current paragraph
+nnoremap <Bslash>q gqap
 " \r reloads .vimrc
 nnoremap <Bslash>r :<C-U>source $MYVIMRC<CR>
 " \s toggles spell checking
@@ -268,6 +272,8 @@ nnoremap <Bslash>V :<C-U>let b: t: w:<CR>
 nnoremap <Bslash>w :<C-U>set wrap! wrap?<CR>
 " \x strips trailing whitespace via a custom plugin
 nmap <Bslash>x <Plug>StripTrailingWhitespace
+" \y shows all registers
+nnoremap <Bslash>y :<C-U>registers<CR>
 " \z sets NZ English spelling (compare \u)
 nnoremap <Bslash>z :<C-U>setlocal spelllang=en_nz<CR>
 
-- 
cgit v1.2.3


From 6013e361d0d826bd661abd62a22bec0a6286c613 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 6 Jul 2018 13:28:20 +1200
Subject: Remove .vimrc 'report' setting

The default is fine.
---
 vim/vimrc | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index fe7e3a6c..63be1692 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -104,9 +104,6 @@ set nomodeline
 " Treat numbers with a leading zero as decimal, not octal
 set nrformats-=octal
 
-" Always tell me the number of lines changed by a command
-set report=0
-
 " Abbreviate some more regularly displayed messages
 set shortmess+=I  " Don't show startup splash screen
 set shortmess+=m  " [Modified] -> [+]
-- 
cgit v1.2.3


From aa11fe749a37ceebb8eb25ba9ea1efe4d17d0e62 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 6 Jul 2018 13:40:59 +1200
Subject: Correct has() to exists() in .vimrc

---
 vim/vimrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vim/vimrc')

diff --git a/vim/vimrc b/vim/vimrc
index 63be1692..300fc3a5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,7 +14,7 @@ if has('autocmd')
 endif
 
 " Options dependent on the syntax feature
-if has('syntax') && !has('g:syntax_on')
+if has('syntax') && !exists('g:syntax_on')
 
   " Use syntax highlighting
   syntax enable
-- 
cgit v1.2.3