Mercurial > vim
diff runtime/menu.vim @ 18186:03b854983b14
Update runtime files.
Commit: https://github.com/vim/vim/commit/5be4ceecea5520265066eac972460ebb1cdf05e7
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 27 19:34:08 2019 +0200
Update runtime files.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 27 Sep 2019 19:45:06 +0200 |
| parents | 834b7854aa3c |
| children | e9a47bcf7b94 |
line wrap: on
line diff
--- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -2,7 +2,7 @@ " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2019 Jan 27 +" Last Change: 2019 Sep 26 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. @@ -29,7 +29,8 @@ if exists("v:lang") || &langmenu != "" let s:lang = v:lang endif " A language name must be at least two characters, don't accept "C" - if strlen(s:lang) > 1 + " Also skip "en_US" to avoid picking up "en_gb" translations. + if strlen(s:lang) > 1 && s:lang !~? '^en_us' " When the language does not include the charset add 'encoding' if s:lang =~ '^\a\a$\|^\a\a_\a\a$' let s:lang = s:lang . '.' . &enc