From f0786745e4ebb57fc598c0796cdc7db89ae4c563 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 6 Jul 2019 22:52:00 +1200
Subject: Refine NZ vs US Vim spelling setup

---
 vim/vimrc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'vim')

diff --git a/vim/vimrc b/vim/vimrc
index c65115ae..5109ce6c 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -363,10 +363,10 @@ endif
 " since Vim uses it internally for 'spellfile' assignment to decide whether
 " the path is valid.  We put it back immediately afterwards.
 "
-set spelllang=en_nz
+set spelllang^=en_nz
 CreatePath $MYVIM/spell
 let s:spellfile = $MYVIM.'/spell/'.join([
-      \ split(&spelllang, '_')[0],
+      \ split(split#Option(&spelllang)[0], '_')[0],
       \ &encoding,
       \ 'add',
       \], '.')
@@ -1358,9 +1358,9 @@ nnoremap <Leader>f
 " target audience.  I generally use US English for international audiences.
 "
 nnoremap <Leader>u
-      \ :<C-U>set spelllang=en_us<CR>
+      \ :<C-U>set spelllang-=en_nz spelllang^=en_us spelllang?<CR>
 nnoremap <Leader>z
-      \ :<C-U>set spelllang=en_nz<CR>
+      \ :<C-U>set spelllang-=en_us spelllang^=en_nz spelllang?<CR>
 
 " The next mapping is also for toggling an option, but it’s more complicated;
 " it uses a simple plugin of mine called copy_linebreak.vim to manage several
-- 
cgit v1.2.3