From 502e91756e99181d5fe668fad2e868dc7f3f4fea Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 27 Nov 2022 16:18:33 +0000 Subject: patch 9.0.0960: error when using the "Spelling / Find More Languages" menu Problem: Error when using the "Tools / Spelling / Find More Languages" menu. Solution: Remove "". Reset "g:menutrans_set_lang_to" when 'encoding' changes. (closes #11625) --- runtime/menu.vim | 9 +++++---- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/runtime/menu.vim b/runtime/menu.vim index ab509a6927..59fa12603a 100644 --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -474,7 +474,7 @@ if has("spell") an 40.335.270 &Tools.&Spelling.&Find\ More\ Languages :call SpellLang() 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 SpellLang() + au! EncodingChanged * call SpellLang(true) augroup END enddef - endif " Tools.Fold Menu diff --git a/src/version.c b/src/version.c index cd6f0b6736..a9a0c72a0c 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 960, /**/ 959, /**/ -- cgit v1.2.3