summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-11-27 16:18:33 +0000
committerBram Moolenaar <Bram@vim.org>2022-11-27 16:18:33 +0000
commit502e91756e99181d5fe668fad2e868dc7f3f4fea (patch)
tree76e1f0e8194b753152d4c5ad045896a73d9e3498
parent8b336a6614463fb9ce72db24d00c5aef4f22697e (diff)
downloadvim-git-9.0.0960.tar.gz
patch 9.0.0960: error when using the "Spelling / Find More Languages" menuv9.0.0960
Problem: Error when using the "Tools / Spelling / Find More Languages" menu. Solution: Remove "<SID>". Reset "g:menutrans_set_lang_to" when 'encoding' changes. (closes #11625)
-rw-r--r--runtime/menu.vim9
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 4 deletions
diff --git a/runtime/menu.vim b/runtime/menu.vim
index ab509a692..59fa12603 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -474,7 +474,7 @@ if has("spell")
an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages :call <SID>SpellLang()<CR>
let s:undo_spelllang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
- def s:SpellLang()
+ def s:SpellLang(encChanged = false)
for cmd in s:undo_spelllang
exe "silent! " .. cmd
endfor
@@ -482,7 +482,8 @@ if has("spell")
var enc = &enc == "iso-8859-15" ? "latin1" : &enc
- if !exists("g:menutrans_set_lang_to")
+ # Reset g:menutrans_set_lang_to when called for the EncodingChanged event.
+ if !exists("g:menutrans_set_lang_to") || encChanged
g:menutrans_set_lang_to = 'Set Language to'
endif
@@ -510,12 +511,12 @@ if has("spell")
else
echomsg "Found " .. found .. " more spell files"
endif
+
# Need to redo this when 'encoding' is changed.
augroup spellmenu
- au! EncodingChanged * call <SID>SpellLang()
+ au! EncodingChanged * call SpellLang(true)
augroup END
enddef
-
endif
" Tools.Fold Menu
diff --git a/src/version.c b/src/version.c
index cd6f0b673..a9a0c72a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 960,
+/**/
959,
/**/
958,