diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-02-04 19:48:06 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-02-04 19:48:06 +0000 |
commit | 3e79c97c18c50f97797ab13ed81c4011eba9aba0 (patch) | |
tree | 42f48424033a7a680059526fe1735c4bb7de1f9c /runtime/synmenu.vim | |
parent | a2baa73d1d33014adea0fd9567949089ca21a782 (diff) |
Update runtime files; use compiled functions
Diffstat (limited to 'runtime/synmenu.vim')
-rw-r--r-- | runtime/synmenu.vim | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim index d1e4becb2b..06e37258e7 100644 --- a/runtime/synmenu.vim +++ b/runtime/synmenu.vim @@ -2,31 +2,26 @@ " This file is normally sourced from menu.vim. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2017 Oct 28 +" Last Change: 2022 Feb 04 " Define the SetSyn function, used for the Syntax menu entries. " Set 'filetype' and also 'syntax' if it is manually selected. -fun! SetSyn(name) - if a:name == "fvwm1" - let use_fvwm_1 = 1 - let use_fvwm_2 = 0 - let name = "fvwm" - elseif a:name == "fvwm2" - let use_fvwm_2 = 1 - let use_fvwm_1 = 0 - let name = "fvwm" - else - let name = a:name +def SetSyn(name: string) + var filetype = name + if name == "fvwm1" || name == "fvwm2" + g:use_fvwm_1 = name == "fvwm1" + g:use_fvwm_2 = name == "fvwm2" + filetype = "fvwm" endif if !exists("s:syntax_menu_synonly") - exe "set ft=" . name + exe "set ft=" .. filetype if exists("g:syntax_manual") - exe "set syn=" . name + exe "set syn=" .. filetype endif else - exe "set syn=" . name + exe "set syn=" .. filetype endif -endfun +enddef " <> notation is used here, remove '<' from 'cpoptions' let s:cpo_save = &cpo @@ -404,7 +399,6 @@ an 50.90.120 &Syntax.PQ.Pam\ config :cal SetSyn("pamconf")<CR> an 50.90.130 &Syntax.PQ.PApp :cal SetSyn("papp")<CR> an 50.90.140 &Syntax.PQ.Pascal :cal SetSyn("pascal")<CR> an 50.90.150 &Syntax.PQ.Password\ file :cal SetSyn("passwd")<CR> -an 50.90.490 &Syntax.PQ.Pbtxt :cal SetSyn("pbtxt")<CR> an 50.90.160 &Syntax.PQ.PCCTS :cal SetSyn("pccts")<CR> an 50.90.170 &Syntax.PQ.PDF :cal SetSyn("pdf")<CR> an 50.90.180 &Syntax.PQ.Perl.Perl :cal SetSyn("perl")<CR> @@ -457,19 +451,20 @@ an 50.100.180 &Syntax.R.RCS.RCS\ file :cal SetSyn("rcs")<CR> an 50.100.190 &Syntax.R.Readline\ config :cal SetSyn("readline")<CR> an 50.100.200 &Syntax.R.Rebol :cal SetSyn("rebol")<CR> an 50.100.210 &Syntax.R.ReDIF :cal SetSyn("redif")<CR> -an 50.100.220 &Syntax.R.Relax\ NG :cal SetSyn("rng")<CR> -an 50.100.230 &Syntax.R.Remind :cal SetSyn("remind")<CR> -an 50.100.240 &Syntax.R.Relax\ NG\ compact :cal SetSyn("rnc")<CR> -an 50.100.250 &Syntax.R.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR> -an 50.100.260 &Syntax.R.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR> -an 50.100.270 &Syntax.R.Resolv\.conf :cal SetSyn("resolv")<CR> -an 50.100.280 &Syntax.R.Reva\ Forth :cal SetSyn("reva")<CR> -an 50.100.290 &Syntax.R.Rexx :cal SetSyn("rexx")<CR> -an 50.100.300 &Syntax.R.Robots\.txt :cal SetSyn("robots")<CR> -an 50.100.310 &Syntax.R.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR> -an 50.100.320 &Syntax.R.Rpcgen :cal SetSyn("rpcgen")<CR> -an 50.100.330 &Syntax.R.RPL/2 :cal SetSyn("rpl")<CR> -an 50.100.340 &Syntax.R.ReStructuredText :cal SetSyn("rst")<CR> +an 50.100.220 &Syntax.R.Rego :cal SetSyn("rego")<CR> +an 50.100.230 &Syntax.R.Relax\ NG :cal SetSyn("rng")<CR> +an 50.100.240 &Syntax.R.Remind :cal SetSyn("remind")<CR> +an 50.100.250 &Syntax.R.Relax\ NG\ compact :cal SetSyn("rnc")<CR> +an 50.100.260 &Syntax.R.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR> +an 50.100.270 &Syntax.R.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR> +an 50.100.280 &Syntax.R.Resolv\.conf :cal SetSyn("resolv")<CR> +an 50.100.290 &Syntax.R.Reva\ Forth :cal SetSyn("reva")<CR> +an 50.100.300 &Syntax.R.Rexx :cal SetSyn("rexx")<CR> +an 50.100.310 &Syntax.R.Robots\.txt :cal SetSyn("robots")<CR> +an 50.100.320 &Syntax.R.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR> +an 50.100.330 &Syntax.R.Rpcgen :cal SetSyn("rpcgen")<CR> +an 50.100.340 &Syntax.R.RPL/2 :cal SetSyn("rpl")<CR> +an 50.100.350 &Syntax.R.ReStructuredText :cal SetSyn("rst")<CR> an 50.110.100 &Syntax.M.ReStructuredText\ with\ R\ statements :cal SetSyn("rrst")<CR> an 50.120.100 &Syntax.R.RTF :cal SetSyn("rtf")<CR> an 50.120.110 &Syntax.R.Ruby :cal SetSyn("ruby")<CR> @@ -652,11 +647,11 @@ an 50.170.440 &Syntax.WXYZ.Zimbu :cal SetSyn("zimbu")<CR> an 50.195 &Syntax.-SEP1- <Nop> an <silent> 50.200 &Syntax.Set\ '&syntax'\ Only :call <SID>Setsynonly()<CR> -fun! s:Setsynonly() +fun s:Setsynonly() let s:syntax_menu_synonly = 1 endfun an <silent> 50.202 &Syntax.Set\ '&filetype'\ Too :call <SID>Nosynonly()<CR> -fun! s:Nosynonly() +fun s:Nosynonly() if exists("s:syntax_menu_synonly") unlet s:syntax_menu_synonly endif |