aboutsummaryrefslogtreecommitdiff
path: root/autoload
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2023-04-06 16:00:00 +1200
committerTom Ryder <tom@sanctum.geek.nz>2023-04-06 16:00:00 +1200
commit6199ee785c6fb964292ec6e82c5b8a0f79e26069 (patch)
treeacb4e2286730b3dab720467b9c1f95cc500d86fc /autoload
parentMerge branch 'hotfix/v1.1.1' (diff)
parentAdjust logic and comments for picking paths (diff)
downloadvim-spellfile-local-master.tar.gz
vim-spellfile-local-master.zip
Merge branch 'release/v2.0.0'HEADv2.0.0masterdevelop
* release/v2.0.0: Adjust logic and comments for picking paths Require Vim version 8.0, inline OptionSet If OptionSet is available, trigger on 'spelllang' Add a version guard
Diffstat (limited to 'autoload')
-rw-r--r--autoload/spellfile_local.vim24
1 files changed, 12 insertions, 12 deletions
diff --git a/autoload/spellfile_local.vim b/autoload/spellfile_local.vim
index 177503f..dc9d2cc 100644
--- a/autoload/spellfile_local.vim
+++ b/autoload/spellfile_local.vim
@@ -15,24 +15,24 @@ function! spellfile_local#() abort
return
endif
let lang = split(spelllangs[0], '_')[0]
- let encoding = &encoding
" Make a list of all the spellfile names for which we want to search in
- " every directory; the first is the normal lang.encoding.add, the second is
- " filename.lang.encoding.add, and the third, if there's a filetype set, is
+ " every directory; first is the normal lang.encoding.add, then if there's
+ " a path set filename.lang.encoding.add, and then if there's a filetype set,
" filetype.lang.encoding.add.
"
- let basenames = [s:Filename([lang, encoding, 'add'])]
- let path = expand('<afile>:p')
- call add(
- \ basenames,
- \ s:Filename(['path', path, lang, encoding, 'add'])
- \)
- let filetype = &filetype
- if filetype !=# ''
+ let basenames = [s:Filename([lang, &encoding, 'add'])]
+ let path = expand('%:p')
+ if path !=# ''
+ call add(
+ \ basenames,
+ \ s:Filename(['path', path, lang, &encoding, 'add'])
+ \)
+ endif
+ if &filetype !=# ''
call add(
\ basenames,
- \ s:Filename(['filetype', filetype, lang, encoding, 'add'])
+ \ s:Filename(['filetype', &filetype, lang, &encoding, 'add'])
\)
endif