diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim
index d4a27fd..5ed34f2 100644
--- a/runtime/autoload/vimball.vim
+++ b/runtime/autoload/vimball.vim
@@ -1,7 +1,7 @@
 " vimball.vim : construct a file containing both paths and files
 " Author:	Charles E. Campbell, Jr.
-" Date:		Jan 03, 2007
-" Version:	21
+" Date:		May 07, 2007
+" Version:	22
 " GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
 " Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.
 "            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
@@ -15,7 +15,7 @@
  finish
 endif
 let s:keepcpo        = &cpo
-let g:loaded_vimball = "v21"
+let g:loaded_vimball = "v22"
 set cpo&vim
 
 " =====================================================================
@@ -583,13 +583,14 @@
   let s:fenkeep = &fen
   let s:hidkeep = &hidden
   let s:ickeep  = &ic
+  let s:lzkeep  = &lz
+  let s:pmkeep  = &pm
   let s:repkeep = &report
   let s:vekeep  = &ve
-  let s:lzkeep  = &lz
   if exists("&acd")
-   set ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz
+   set ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz pm=
   else
-   set ei=all ve=all nofen noic report=999 nohid bt= ma lz
+   set ei=all ve=all nofen noic report=999 nohid bt= ma lz pm=
   endif
 "  call Dret("SaveSettings")
 endfun
@@ -606,6 +607,7 @@
   let &hidden = s:hidkeep
   let &ic     = s:ickeep
   let &lz     = s:lzkeep
+  let &pm     = s:pmkeep
   let &report = s:repkeep
   let &ve     = s:vekeep
   let &ei     = s:eikeep
@@ -615,9 +617,9 @@
    call setpos("'a",s:makeep)
   endif
   if exists("&acd")
-   unlet s:regakeep s:acdkeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep
+   unlet s:regakeep s:acdkeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep
   else
-   unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep
+   unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep
   endif
   set bt=nofile noma
 "  call Dret("RestoreSettings")
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 87a7c27..82f7d0d 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.1a.  Last change: 2007 May 05
+*index.txt*     For Vim version 7.1b.  Last change: 2007 May 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 32a76c2..5b5615b 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.1a.  Last change: 2007 Mar 20
+*message.txt*   For Vim version 7.1b.  Last change: 2007 Mar 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt
index 764bda7..6b23afa 100644
--- a/runtime/doc/os_mint.txt
+++ b/runtime/doc/os_mint.txt
@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.1a.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 7.1b.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 432e6a7..1628755 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 7.1a.  Last change: 2007 Mar 11
+*tabpage.txt*   For Vim version 7.1b.  Last change: 2007 Mar 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt
index 9c11bf4..8a8ff17 100644
--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -1,4 +1,4 @@
-*usr_45.txt*	For Vim version 7.1a.  Last change: 2006 Apr 24
+*usr_45.txt*	For Vim version 7.1b.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt
index 04c31a7..2a39845 100644
--- a/runtime/doc/version4.txt
+++ b/runtime/doc/version4.txt
@@ -1,4 +1,4 @@
-*version4.txt*  For Vim version 7.1a.  Last change: 2006 Apr 24
+*version4.txt*  For Vim version 7.1b.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 0c9213a..cd8ea4e 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 7.1a.  Last change: 2006 Nov 18
+*vi_diff.txt*   For Vim version 7.1b.  Last change: 2007 May 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -155,7 +155,7 @@
 	considered changed anymore.  You can exit it with :q, without <!>.
 	When undoing a few changes and then making a new change Vim will
 	create a branch in the undo tree.  This means you can go back to any
-	state of the text, there is no risc of a change causing text to be
+	state of the text, there is no risk of a change causing text to be
 	lost forever. |undo-tree|
 
 Graphical User Interface (GUI).				|gui|
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 7a9130e..1a2cda1 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,6 +1,6 @@
 " Script to define the syntax menu in synmenu.vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2007 May 04
+" Last Change:	2007 May 10
 
 " This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
@@ -87,6 +87,7 @@
 SynMenu AB.Asterisk\ config:asterisk
 SynMenu AB.Asterisk\ voicemail\ config:asteriskvm
 SynMenu AB.Atlas:atlas
+SynMenu AB.AutoHotKey:autohotkey
 SynMenu AB.AutoIt:autoit
 SynMenu AB.Automake:automake
 SynMenu AB.Avenue:ave
@@ -112,11 +113,9 @@
 SynMenu C.C++:cpp
 SynMenu C.C#:cs
 SynMenu C.Calendar:calendar
-SynMenu C.CDL:cdl
-SynMenu C.Crontab:crontab
-SynMenu C.Cyn++:cynpp
-SynMenu C.Cynlib:cynlib
 SynMenu C.Cascading\ Style\ Sheets:css
+SynMenu C.CDL:cdl
+SynMenu C.Cdrdao\ TOC:cdrtoc
 SynMenu C.Century\ Term:cterm
 SynMenu C.CH\ script:ch
 SynMenu C.ChangeLog:changelog
@@ -128,18 +127,22 @@
 SynMenu C.Clipper:clipper
 SynMenu C.Cmake:cmake
 SynMenu C.Cmusrc:cmusrc
-SynMenu C.Cold\ Fusion:cf
-SynMenu C.Config.Cfg\ Config\ file:cfg
-SynMenu C.Config.Generic\ Config\ file:conf
-SynMenu C.Config.Configure\.in:config
-SynMenu C.CRM114:crm
-SynMenu C.Ctrl-H:ctrlh
 SynMenu C.Cobol:cobol
+SynMenu C.Cold\ Fusion:cf
+SynMenu C.Conary\ Recipe:conaryrecipe
+SynMenu C.Config.Cfg\ Config\ file:cfg
+SynMenu C.Config.Configure\.in:config
+SynMenu C.Config.Generic\ Config\ file:conf
+SynMenu C.CRM114:crm
+SynMenu C.Crontab:crontab
 SynMenu C.CSP:csp
+SynMenu C.Ctrl-H:ctrlh
 SynMenu C.CUPL.CUPL:cupl
 SynMenu C.CUPL.Simulation:cuplsim
 SynMenu C.CVS.commit\ file:cvs
 SynMenu C.CVS.cvsrc:cvsrc
+SynMenu C.Cyn++:cynpp
+SynMenu C.Cynlib:cynlib
 
 SynMenu DE.D:d
 SynMenu DE.Debian.Debian\ ChangeLog:debchangelog
@@ -193,6 +196,7 @@
 SynMenu FG.Forth:forth
 SynMenu FG.Fortran:fortran
 SynMenu FG.FoxPro:foxpro
+SynMenu FG.FrameScript:framescript
 SynMenu FG.Fstab:fstab
 SynMenu FG.Fvwm.Fvwm\ configuration:fvwm1
 SynMenu FG.Fvwm.Fvwm2\ configuration:fvwm2
@@ -261,7 +265,8 @@
 SynMenu L-Ma.LamdaProlog:lprolog
 SynMenu L-Ma.Latte:latte
 SynMenu L-Ma.Ld\ script:ld
-SynMenu L-Ma.LDAP\ LDIF:ldif
+SynMenu L-Ma.LDAP.LDIF:ldif
+SynMenu L-Ma.LDAP.Configuration:ldapconf
 SynMenu L-Ma.Lex:lex
 SynMenu L-Ma.LFTP\ config:lftp
 SynMenu L-Ma.Libao:libao
@@ -270,6 +275,7 @@
 SynMenu L-Ma.Limits\ config:limits
 SynMenu L-Ma.Lisp:lisp
 SynMenu L-Ma.Lite:lite
+SynMenu L-Ma.LiteStep\ RC:litestep
 SynMenu L-Ma.Locale\ Input:fdcc
 SynMenu L-Ma.Login\.access:loginaccess
 SynMenu L-Ma.Login\.defs:logindefs