From a1a3038c30a37471a1b912df98a769c090b4f3a2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 6 Jul 2019 23:23:01 +1200 Subject: Revert to simpler spelling approach --- vim/vimrc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 7e2eb099..f7d60f5e 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -363,10 +363,11 @@ 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:spelllang = split#Option(&spelllang) let s:spellfile = $MYVIM.'/spell/'.join([ - \ split(split#Option(&spelllang)[0], '_')[0], + \ split(s:spelllang[0], '_')[0], \ &encoding, \ 'add', \], '.') @@ -376,6 +377,7 @@ if has('unix') endif execute 'set spellfile^='.escape#Arg(escape#Item(s:spellfile)) let &isfname = s:isfname +unlet s:isfname " Spell checking includes optional support for catching lower case letters at " the start of sentences, and defines a pattern in 'spellcapcheck' for the end @@ -1357,10 +1359,10 @@ nnoremap f " excluding or including the ‘u’ in words like 'favourite', depending on the " target audience. I generally use US English for international audiences. " -nnoremap u - \ :set spelllang-=en_nz spelllang^=en_us spelllang? nnoremap z - \ :set spelllang-=en_us spelllang^=en_nz spelllang? + \ :set spelllang=en_nz +nnoremap u + \ :set spelllang=en_us " 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