diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index c3cb625..6a9d69b 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -2,7 +2,7 @@
 " This file is normally sourced from menu.vim.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2003 Jun 22
+" Last Change:	2006 Apr 27
 
 " Define the SetSyn function, used for the Syntax menu entries.
 " Set 'filetype' and also 'syntax' if it is manually selected.
@@ -28,6 +28,10 @@
   endif
 endfun
 
+" <> notation is used here, remove '<' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
 " The following menu items are generated by makemenu.vim.
 " The Start Of The Syntax Menu
 
@@ -158,31 +162,32 @@
 an 50.30.510 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
 an 50.30.520 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
 an 50.40.100 &Syntax.FG.Fetchmail :cal SetSyn("fetchmail")<CR>
-an 50.40.110 &Syntax.FG.Focus\ Executable :cal SetSyn("focexec")<CR>
-an 50.40.120 &Syntax.FG.Focus\ Master :cal SetSyn("master")<CR>
-an 50.40.130 &Syntax.FG.FORM :cal SetSyn("form")<CR>
-an 50.40.140 &Syntax.FG.Forth :cal SetSyn("forth")<CR>
-an 50.40.150 &Syntax.FG.Fortran :cal SetSyn("fortran")<CR>
-an 50.40.160 &Syntax.FG.FoxPro :cal SetSyn("foxpro")<CR>
-an 50.40.170 &Syntax.FG.Fstab :cal SetSyn("fstab")<CR>
-an 50.40.180 &Syntax.FG.Fvwm.Fvwm\ configuration :cal SetSyn("fvwm1")<CR>
-an 50.40.190 &Syntax.FG.Fvwm.Fvwm2\ configuration :cal SetSyn("fvwm2")<CR>
-an 50.40.200 &Syntax.FG.Fvwm.Fvwm2\ configuration\ with\ M4 :cal SetSyn("fvwm2m4")<CR>
-an 50.40.220 &Syntax.FG.GDB\ command\ file :cal SetSyn("gdb")<CR>
-an 50.40.230 &Syntax.FG.GDMO :cal SetSyn("gdmo")<CR>
-an 50.40.240 &Syntax.FG.Gedcom :cal SetSyn("gedcom")<CR>
-an 50.40.250 &Syntax.FG.Gkrellmrc :cal SetSyn("gkrellmrc")<CR>
-an 50.40.260 &Syntax.FG.GP :cal SetSyn("gp")<CR>
-an 50.40.270 &Syntax.FG.GPG :cal SetSyn("gpg")<CR>
-an 50.40.280 &Syntax.FG.Group\ file :cal SetSyn("group")<CR>
-an 50.40.290 &Syntax.FG.Grub :cal SetSyn("grub")<CR>
-an 50.40.300 &Syntax.FG.GNU\ Server\ Pages :cal SetSyn("gsp")<CR>
-an 50.40.310 &Syntax.FG.GNUplot :cal SetSyn("gnuplot")<CR>
-an 50.40.320 &Syntax.FG.GrADS\ scripts :cal SetSyn("grads")<CR>
-an 50.40.330 &Syntax.FG.Gretl :cal SetSyn("gretl")<CR>
-an 50.40.340 &Syntax.FG.Groff :cal SetSyn("groff")<CR>
-an 50.40.350 &Syntax.FG.Groovy :cal SetSyn("groovy")<CR>
-an 50.40.360 &Syntax.FG.GTKrc :cal SetSyn("gtkrc")<CR>
+an 50.40.110 &Syntax.FG.FlexWiki :cal SetSyn("flexwiki")<CR>
+an 50.40.120 &Syntax.FG.Focus\ Executable :cal SetSyn("focexec")<CR>
+an 50.40.130 &Syntax.FG.Focus\ Master :cal SetSyn("master")<CR>
+an 50.40.140 &Syntax.FG.FORM :cal SetSyn("form")<CR>
+an 50.40.150 &Syntax.FG.Forth :cal SetSyn("forth")<CR>
+an 50.40.160 &Syntax.FG.Fortran :cal SetSyn("fortran")<CR>
+an 50.40.170 &Syntax.FG.FoxPro :cal SetSyn("foxpro")<CR>
+an 50.40.180 &Syntax.FG.Fstab :cal SetSyn("fstab")<CR>
+an 50.40.190 &Syntax.FG.Fvwm.Fvwm\ configuration :cal SetSyn("fvwm1")<CR>
+an 50.40.200 &Syntax.FG.Fvwm.Fvwm2\ configuration :cal SetSyn("fvwm2")<CR>
+an 50.40.210 &Syntax.FG.Fvwm.Fvwm2\ configuration\ with\ M4 :cal SetSyn("fvwm2m4")<CR>
+an 50.40.230 &Syntax.FG.GDB\ command\ file :cal SetSyn("gdb")<CR>
+an 50.40.240 &Syntax.FG.GDMO :cal SetSyn("gdmo")<CR>
+an 50.40.250 &Syntax.FG.Gedcom :cal SetSyn("gedcom")<CR>
+an 50.40.260 &Syntax.FG.Gkrellmrc :cal SetSyn("gkrellmrc")<CR>
+an 50.40.270 &Syntax.FG.GP :cal SetSyn("gp")<CR>
+an 50.40.280 &Syntax.FG.GPG :cal SetSyn("gpg")<CR>
+an 50.40.290 &Syntax.FG.Group\ file :cal SetSyn("group")<CR>
+an 50.40.300 &Syntax.FG.Grub :cal SetSyn("grub")<CR>
+an 50.40.310 &Syntax.FG.GNU\ Server\ Pages :cal SetSyn("gsp")<CR>
+an 50.40.320 &Syntax.FG.GNUplot :cal SetSyn("gnuplot")<CR>
+an 50.40.330 &Syntax.FG.GrADS\ scripts :cal SetSyn("grads")<CR>
+an 50.40.340 &Syntax.FG.Gretl :cal SetSyn("gretl")<CR>
+an 50.40.350 &Syntax.FG.Groff :cal SetSyn("groff")<CR>
+an 50.40.360 &Syntax.FG.Groovy :cal SetSyn("groovy")<CR>
+an 50.40.370 &Syntax.FG.GTKrc :cal SetSyn("gtkrc")<CR>
 an 50.50.100 &Syntax.HIJK.Haskell.Haskell :cal SetSyn("haskell")<CR>
 an 50.50.110 &Syntax.HIJK.Haskell.Haskell-c2hs :cal SetSyn("chaskell")<CR>
 an 50.50.120 &Syntax.HIJK.Haskell.Haskell-literate :cal SetSyn("lhaskell")<CR>
@@ -274,32 +279,33 @@
 an 50.70.200 &Syntax.Me-NO.Monk :cal SetSyn("monk")<CR>
 an 50.70.210 &Syntax.Me-NO.Mplayer\ config :cal SetSyn("mplayerconf")<CR>
 an 50.70.220 &Syntax.Me-NO.MOO :cal SetSyn("moo")<CR>
-an 50.70.230 &Syntax.Me-NO.MS-DOS/Windows.4DOS\ \.bat\ file :cal SetSyn("btm")<CR>
-an 50.70.240 &Syntax.Me-NO.MS-DOS/Windows.\.bat\/\.cmd\ file :cal SetSyn("dosbatch")<CR>
-an 50.70.250 &Syntax.Me-NO.MS-DOS/Windows.\.ini\ file :cal SetSyn("dosini")<CR>
-an 50.70.260 &Syntax.Me-NO.MS-DOS/Windows.Module\ Definition :cal SetSyn("def")<CR>
-an 50.70.270 &Syntax.Me-NO.MS-DOS/Windows.Registry :cal SetSyn("registry")<CR>
-an 50.70.280 &Syntax.Me-NO.MS-DOS/Windows.Resource\ file :cal SetSyn("rc")<CR>
-an 50.70.290 &Syntax.Me-NO.Msql :cal SetSyn("msql")<CR>
-an 50.70.300 &Syntax.Me-NO.MuPAD :cal SetSyn("mupad")<CR>
-an 50.70.310 &Syntax.Me-NO.MUSHcode :cal SetSyn("mush")<CR>
-an 50.70.320 &Syntax.Me-NO.Muttrc :cal SetSyn("muttrc")<CR>
-an 50.70.340 &Syntax.Me-NO.Nanorc :cal SetSyn("nanorc")<CR>
-an 50.70.350 &Syntax.Me-NO.Nastran\ input/DMAP :cal SetSyn("nastran")<CR>
-an 50.70.360 &Syntax.Me-NO.Natural :cal SetSyn("natural")<CR>
-an 50.70.370 &Syntax.Me-NO.Netrc :cal SetSyn("netrc")<CR>
-an 50.70.380 &Syntax.Me-NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
-an 50.70.390 &Syntax.Me-NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
-an 50.70.400 &Syntax.Me-NO.Nroff :cal SetSyn("nroff")<CR>
-an 50.70.410 &Syntax.Me-NO.NSIS\ script :cal SetSyn("nsis")<CR>
-an 50.70.430 &Syntax.Me-NO.Objective\ C :cal SetSyn("objc")<CR>
-an 50.70.440 &Syntax.Me-NO.Objective\ C++ :cal SetSyn("objcpp")<CR>
-an 50.70.450 &Syntax.Me-NO.OCAML :cal SetSyn("ocaml")<CR>
-an 50.70.460 &Syntax.Me-NO.Occam :cal SetSyn("occam")<CR>
-an 50.70.470 &Syntax.Me-NO.Omnimark :cal SetSyn("omnimark")<CR>
-an 50.70.480 &Syntax.Me-NO.OpenROAD :cal SetSyn("openroad")<CR>
-an 50.70.490 &Syntax.Me-NO.Open\ Psion\ Lang :cal SetSyn("opl")<CR>
-an 50.70.500 &Syntax.Me-NO.Oracle\ config :cal SetSyn("ora")<CR>
+an 50.70.230 &Syntax.Me-NO.Mrxvtrc :cal SetSyn("mrxvtrc")<CR>
+an 50.70.240 &Syntax.Me-NO.MS-DOS/Windows.4DOS\ \.bat\ file :cal SetSyn("btm")<CR>
+an 50.70.250 &Syntax.Me-NO.MS-DOS/Windows.\.bat\/\.cmd\ file :cal SetSyn("dosbatch")<CR>
+an 50.70.260 &Syntax.Me-NO.MS-DOS/Windows.\.ini\ file :cal SetSyn("dosini")<CR>
+an 50.70.270 &Syntax.Me-NO.MS-DOS/Windows.Module\ Definition :cal SetSyn("def")<CR>
+an 50.70.280 &Syntax.Me-NO.MS-DOS/Windows.Registry :cal SetSyn("registry")<CR>
+an 50.70.290 &Syntax.Me-NO.MS-DOS/Windows.Resource\ file :cal SetSyn("rc")<CR>
+an 50.70.300 &Syntax.Me-NO.Msql :cal SetSyn("msql")<CR>
+an 50.70.310 &Syntax.Me-NO.MuPAD :cal SetSyn("mupad")<CR>
+an 50.70.320 &Syntax.Me-NO.MUSHcode :cal SetSyn("mush")<CR>
+an 50.70.330 &Syntax.Me-NO.Muttrc :cal SetSyn("muttrc")<CR>
+an 50.70.350 &Syntax.Me-NO.Nanorc :cal SetSyn("nanorc")<CR>
+an 50.70.360 &Syntax.Me-NO.Nastran\ input/DMAP :cal SetSyn("nastran")<CR>
+an 50.70.370 &Syntax.Me-NO.Natural :cal SetSyn("natural")<CR>
+an 50.70.380 &Syntax.Me-NO.Netrc :cal SetSyn("netrc")<CR>
+an 50.70.390 &Syntax.Me-NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
+an 50.70.400 &Syntax.Me-NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
+an 50.70.410 &Syntax.Me-NO.Nroff :cal SetSyn("nroff")<CR>
+an 50.70.420 &Syntax.Me-NO.NSIS\ script :cal SetSyn("nsis")<CR>
+an 50.70.440 &Syntax.Me-NO.Objective\ C :cal SetSyn("objc")<CR>
+an 50.70.450 &Syntax.Me-NO.Objective\ C++ :cal SetSyn("objcpp")<CR>
+an 50.70.460 &Syntax.Me-NO.OCAML :cal SetSyn("ocaml")<CR>
+an 50.70.470 &Syntax.Me-NO.Occam :cal SetSyn("occam")<CR>
+an 50.70.480 &Syntax.Me-NO.Omnimark :cal SetSyn("omnimark")<CR>
+an 50.70.490 &Syntax.Me-NO.OpenROAD :cal SetSyn("openroad")<CR>
+an 50.70.500 &Syntax.Me-NO.Open\ Psion\ Lang :cal SetSyn("opl")<CR>
+an 50.70.510 &Syntax.Me-NO.Oracle\ config :cal SetSyn("ora")<CR>
 an 50.80.100 &Syntax.PQ.Packet\ filter\ conf :cal SetSyn("pf")<CR>
 an 50.80.110 &Syntax.PQ.Palm\ resource\ compiler :cal SetSyn("pilrc")<CR>
 an 50.80.120 &Syntax.PQ.Pam\ config :cal SetSyn("pamconf")<CR>
@@ -519,3 +525,6 @@
   endif
 endfun
 
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save