updated for version 7.1b

12 files changed, 131 insertions, 21 deletions

diff --git a/README.txt b/README.txt
index 5f9d0e985..f4cb03ed2 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 7.1a of Vim: Vi IMproved.
+README.txt for version 7.1b of Vim: Vi IMproved.
 
 
 WHAT IS VIM
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
index a518f032a..c81d5a1ce 100644
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.1a.  Last change: 2007 May 03
+*gui_w32.txt*   For Vim version 7.1b.  Last change: 2007 May 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt
index 626da3e2f..51357c7b9 100644
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 7.1a.  Last change: 2006 Apr 30
+*if_ole.txt*    For Vim version 7.1b.  Last change: 2007 May 10
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -40,6 +40,12 @@ instance), code similar to the following should be used:
 	use Win32::OLE;
 	$vim = new Win32::OLE 'Vim.Application';
 
+[C#] >
+        // Add a reference to VIM in your project. 
+        // Choose the COM tab.
+        // Select "VIM Ole Interface 1.1 Type Library"
+	Vim.Vim vimobj = new Vim.Vim();
+
 Vim does not support acting as a "hidden" OLE server, like some other OLE
 Automation servers.  When a client starts up an instance of Vim, that instance
 is immediately visible.  Simply closing the OLE connection to the Vim instance
diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt
index 3b0cb0498..98be3f7d7 100644
--- a/runtime/doc/usr_42.txt
+++ b/runtime/doc/usr_42.txt
@@ -1,4 +1,4 @@
-*usr_42.txt*	For Vim version 7.1a.  Last change: 2006 Apr 24
+*usr_42.txt*	For Vim version 7.1b.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/syntax/conaryrecipe.vim b/runtime/syntax/conaryrecipe.vim
new file mode 100644
index 000000000..b26cf6e35
--- /dev/null
+++ b/runtime/syntax/conaryrecipe.vim
@@ -0,0 +1,99 @@
+" Vim syntax file
+" Language:	Conary Recipe
+" Maintainer:	rPath Inc <http://www.rpath.com>
+" Updated:	2007-05-07
+
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/python.vim
+syn keyword conarySFunction	mainDir addAction addSource addArchive addPatch
+syn keyword conarySFunction	addRedirect addSvnSnapshot addMercurialSnapshot
+syn keyword conarySFunction	addCvsSnapshot
+
+syn keyword conaryGFunction     add addAll addNewGroup addReference createGroup
+syn keyword conaryGFunction     addNewGroup startGroup remove removeComponents
+syn keyword conaryGFunction     replace setByDefault setDefaultGroup 
+syn keyword conaryGFunction     setLabelPath addCopy setSearchPath
+
+syn keyword conaryBFunction 	Run Automake Configure ManualConfigure 
+syn keyword conaryBFunction 	Make MakeParallelSubdir MakeInstall
+syn keyword conaryBFunction 	MakePathsInstall CompilePython
+syn keyword conaryBFunction 	Ldconfig Desktopfile Environment SetModes
+syn keyword conaryBFunction 	Install Copy Move Symlink Link Remove Doc
+syn keyword conaryBFunction 	Create MakeDirs disableParallelMake
+syn keyword conaryBFunction 	ConsoleHelper Replace SGMLCatalogEntry
+syn keyword conaryBFunction 	XInetdService XMLCatalogEntry TestSuite
+syn keyword conaryBFunction     PythonSetup
+
+syn keyword conaryPFunction 	NonBinariesInBindirs FilesInMandir 
+syn keyword conaryPFunction 	ImproperlyShared CheckSonames CheckDestDir
+syn keyword conaryPFunction 	ComponentSpec PackageSpec 
+syn keyword conaryPFunction 	Config InitScript GconfSchema SharedLibrary
+syn keyword conaryPFunction 	ParseManifest MakeDevices DanglingSymlinks
+syn keyword conaryPFunction 	AddModes WarnWriteable IgnoredSetuid
+syn keyword conaryPFunction 	Ownership ExcludeDirectories
+syn keyword conaryPFunction 	BadFilenames BadInterpreterPaths ByDefault
+syn keyword conaryPFunction 	ComponentProvides ComponentRequires Flavor
+syn keyword conaryPFunction 	EnforceConfigLogBuildRequirements Group
+syn keyword conaryPFunction 	EnforceSonameBuildRequirements InitialContents
+syn keyword conaryPFunction 	FilesForDirectories LinkCount
+syn keyword conaryPFunction 	MakdeDevices NonMultilibComponent ObsoletePaths
+syn keyword conaryPFunction 	NonMultilibDirectories NonUTF8Filenames TagSpec
+syn keyword conaryPFunction 	Provides RequireChkconfig Requires TagHandler
+syn keyword conaryPFunction 	TagDescription Transient User UtilizeGroup
+syn keyword conaryPFunction 	WorldWritableExecutables UtilizeUser
+syn keyword conaryPFunction 	WarnWritable Strip CheckDesktopFiles
+
+" Most destdirPolicy aren't called from recipes, except for these
+syn keyword conaryPFunction     AutoDoc RemoveNonPackageFiles TestSuiteFiles
+syn keyword conaryPFunction     TestSuiteLinks
+
+syn match   conaryMacro		"%(\w\+)[sd]" contained
+syn match   conaryBadMacro	"%(\w*)[^sd]" contained " no final marker
+syn keyword conaryArches	contained x86 x86_64 alpha ia64 ppc ppc64 s390
+syn keyword conaryArches	contained sparc sparc64
+syn keyword conarySubArches	contained sse2 3dnow 3dnowext cmov i486 i586
+syn keyword conarySubArches	contained i686 mmx mmxext nx sse sse2
+syn keyword conaryBad		RPM_BUILD_ROOT EtcConfig InstallBucket subDir subdir 
+syn keyword conaryBad		RPM_OPT_FLAGS 
+syn cluster conaryArchFlags 	contains=conaryArches,conarySubArches
+syn match   conaryArch		"Arch\.[a-z0-9A-Z]\+" contains=conaryArches,conarySubArches
+syn match   conaryArch		"Arch\.[a-z0-9A-Z]\+" contains=conaryArches,conarySubArches
+syn keyword conaryKeywords	name buildRequires version clearBuildReqs
+syn keyword conaryUseFlag	contained pcre tcpwrappers gcj gnat selinux pam 
+syn keyword conaryUseFlag	contained bootstrap python perl 
+syn keyword conaryUseFlag	contained readline gdbm emacs krb builddocs 
+syn keyword conaryUseFlag	contained alternatives tcl tk X gtk gnome qt
+syn keyword conaryUseFlag	contained xfce gd ldap sasl pie desktop ssl kde
+syn keyword conaryUseFlag	contained slang netpbm nptl ipv6 buildtests
+syn keyword conaryUseFlag	contained ntpl xen dom0 domU
+syn match   conaryUse		"Use\.[a-z0-9A-Z]\+" contains=conaryUseFlag
+
+" strings
+syn region pythonString		matchgroup=Normal start=+[uU]\='+ end=+'+ skip=+\\\\\|\\'+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonString		matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonString		matchgroup=Normal start=+[uU]\="""+ end=+"""+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonString		matchgroup=Normal start=+[uU]\='''+ end=+'''+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]'+ end=+'+ skip=+\\\\\|\\'+ contains=conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]"+ end=+"+ skip=+\\\\\|\\"+ contains=conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]"""+ end=+"""+ contains=conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]'''+ end=+'''+ contains=conaryMacro,conaryBadMacro
+
+hi def link conaryMacro			Special
+hi def link conaryrecipeFunction	Function
+hi def link conaryError			Error
+hi def link conaryBFunction		conaryrecipeFunction
+hi def link conaryGFunction        	conaryrecipeFunction
+hi def link conarySFunction		Operator
+hi def link conaryPFunction		Typedef
+hi def link conaryFlags			PreCondit
+hi def link conaryArches		Special
+hi def link conarySubArches		Special
+hi def link conaryBad			conaryError
+hi def link conaryBadMacro		conaryError
+hi def link conaryKeywords		Special
+hi def link conaryUseFlag		Typedef
+
+let b:current_syntax = "conaryrecipe"
diff --git a/runtime/syntax/masm.vim b/runtime/syntax/masm.vim
index d7c1e7ea1..efd5fe0bd 100644
--- a/runtime/syntax/masm.vim
+++ b/runtime/syntax/masm.vim
@@ -33,13 +33,15 @@ syn region masmString		start=+"+ end=+"+ oneline contains=@Spell
 
 syn region masmTitleArea	start=+\<TITLE\s+lc=5 start=+\<SUBTITLE\s+lc=8 start=+\<SUBTTL\s+lc=6 end=+$+ end=+;+me=e-1 contains=masmTitle
 syn region masmTextArea		start=+\<NAME\s+lc=4 start=+\<INCLUDE\s+lc=7 start=+\<INCLUDELIB\s+lc=10 end=+$+ end=+;+me=e-1 contains=masmText
-syn match masmTitle		"[^\t ;]\([^;]*[^\t ;]\)\?" contained
+syn match masmTitle		"[^\t ;]\([^;]*[^\t ;]\)\?" contained contains=@Spell
 syn match masmText		"[^\t ;]\([^;]*[^\t ;]\)\?" contained
 
 syn region masmOptionOpt	start=+\<OPTION\s+lc=6 end=+$+ end=+;+me=e-1 contains=masmOption
+syn region masmContextOpt	start=+\<PUSHCONTEXT\s+lc=11 start=+\<POPCONTEXT\s+lc=10 end=+$+ end=+;+me=e-1 contains=masmOption
 syn region masmModelOpt		start=+\.MODEL\s+lc=6 end=+$+ end=+;+me=e-1 contains=masmOption,masmType
 syn region masmSegmentOpt	start=+\<SEGMENT\s+lc=7 end=+$+ end=+;+me=e-1 contains=masmOption,masmString
 syn region masmProcOpt		start=+\<PROC\s+lc=4 end=+$+ end=+;+me=e-1 contains=masmOption,masmType,masmRegister,masmIdentifier
+syn region masmAssumeOpt	start=+\<ASSUME\s+lc=6 end=+$+ end=+;+me=e-1 contains=masmOption,masmOperator,masmType,masmRegister,masmIdentifier
 syn region masmExpression	start=+\.IF\s+lc=3 start=+\.WHILE\s+lc=6 start=+\.UNTIL\s+lc=6 start=+\<IF\s+lc=2 start=+\<IF2\s+lc=3 start=+\<ELSEIF\s+lc=6 start=+\<ELSEIF2\s+lc=7 start=+\<REPEAT\s+lc=6 start=+\<WHILE\s+lc=5 end=+$+ end=+;+me=e-1 contains=masmType,masmOperator,masmRegister,masmIdentifier,masmDecimal,masmBinary,masmHexadecimal,masmFloatRaw,masmString
 
 syn keyword masmOption		TINY SMALL COMPACT MEDIUM LARGE HUGE contained
@@ -58,6 +60,9 @@ syn keyword masmOption		OLDMACROS NOOLDMACROS OLDSTRUCTS contained
 syn keyword masmOption		NOOLDSTRUCTS PROC PROLOGUE READONLY contained
 syn keyword masmOption		NOREADONLY SCOPED NOSCOPED SEGMENT contained
 syn keyword masmOption		SETIF2 contained
+syn keyword masmOption		ABS ALL ASSUMES CPU ERROR EXPORT contained
+syn keyword masmOption		FORCEFRAME LISTING LOADDS NONE contained
+syn keyword masmOption		NONUNIQUE NOTHING OS_DOS RADIX REQ contained
 syn keyword masmType		STDCALL SYSCALL C BASIC FORTRAN PASCAL
 syn keyword masmType		PTR NEAR FAR NEAR16 FAR16 NEAR32 FAR32
 syn keyword masmType		REAL4 REAL8 REAL10 BYTE SBYTE TBYTE
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index d5694dae6..2b392d003 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
-" Language:	Vim 7.0 script
+" Language:	Vim 7.1 script
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	April 25, 2007
-" Version:	7.0-62
+" Last Change:	May 07, 2007
+" Version:	7.1-64
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -23,10 +23,10 @@ syn match   vimCommand contained	"\<z[-+^.=]"
 syn keyword vimOption contained	acd ai akm al aleph allowrevins altkeymap ambiwidth ambw anti antialias ar arab arabic arabicshape ari arshape autochdir autoindent autoread autowrite autowriteall aw awa background backspace backup backupcopy backupdir backupext backupskip balloondelay ballooneval balloonexpr bdir bdlay beval bex bexpr bg bh bin binary biosk bioskey bk bkc bl bomb breakat brk browsedir bs bsdir bsk bt bufhidden buflisted buftype casemap cb ccv cd cdpath cedit cf cfu ch charconvert ci cin cindent cink cinkeys cino cinoptions cinw cinwords clipboard cmdheight cmdwinheight cmp cms co columns com comments commentstring compatible complete completefunc completeopt confirm consk conskey copyindent cot cp cpo cpoptions cpt cscopepathcomp cscopeprg cscopequickfix cscopetag cscopetagorder cscopeverbose cspc csprg csqf cst csto csverb cuc cul cursorcolumn cursorline cwh debug deco def define delcombine dex dg dict dictionary diff diffexpr diffopt digraph dip dir directory display dy ea ead eadirection eb ed edcompatible ef efm ei ek enc encoding endofline eol ep equalalways equalprg errorbells errorfile errorformat esckeys et eventignore ex expandtab exrc fcl fcs fdc fde fdi fdl fdls fdm fdn fdo fdt fen fenc fencs fex ff ffs fileencoding fileencodings fileformat fileformats filetype fillchars fk fkmap flp fml fmr fo foldclose foldcolumn foldenable foldexpr foldignore foldlevel foldlevelstart foldmarker foldmethod foldminlines foldnestmax foldopen foldtext formatexpr formatlistpat formatoptions formatprg fp fs fsync ft gcr gd gdefault gfm gfn gfs gfw ghr go gp grepformat grepprg gtl gtt guicursor guifont guifontset guifontwide guiheadroom guioptions guipty guitablabel guitabtooltip helpfile helpheight helplang hf hh hi hid hidden highlight history hk hkmap hkmapp hkp hl hlg hls hlsearch ic icon iconstring ignorecase im imactivatekey imak imc imcmdline imd imdisable imi iminsert ims imsearch inc include includeexpr incsearch inde indentexpr indentkeys indk inex inf infercase insertmode is isf isfname isi isident isk iskeyword isp isprint joinspaces js key keymap keymodel keywordprg km kmp kp langmap langmenu laststatus lazyredraw lbr lcs linebreak lines linespace lisp lispwords list listchars lm lmap loadplugins lpl ls lsp lw lz ma macatsui magic makeef makeprg mat matchpairs matchtime maxcombine maxfuncdepth maxmapdepth maxmem maxmempattern maxmemtot mco mef menuitems mfd mh mis mkspellmem ml mls mm mmd mmp mmt mod modeline modelines modifiable modified more mouse mousef mousefocus mousehide mousem mousemodel mouses mouseshape mouset mousetime mp mps msm mzq mzquantum nf nrformats nu number numberwidth nuw odev oft ofu omnifunc opendevice operatorfunc opfunc osfiletype pa para paragraphs paste pastetoggle patchexpr patchmode path pdev penc pex pexpr pfn ph pheader pi pm pmbcs pmbfn popt preserveindent previewheight previewwindow printdevice printencoding printexpr printfont printheader printmbcharset printmbfont printoptions prompt pt pumheight pvh pvw qe quoteescape readonly remap report restorescreen revins ri rightleft rightleftcmd rl rlc ro rs rtp ru ruf ruler rulerformat runtimepath sb sbo sbr sc scb scr scroll scrollbind scrolljump scrolloff scrollopt scs sect sections secure sel selection selectmode sessionoptions sft sh shcf shell shellcmdflag shellpipe shellquote shellredir shellslash shelltemp shelltype shellxquote shiftround shiftwidth shm shortmess shortname showbreak showcmd showfulltag showmatch showmode showtabline shq si sidescroll sidescrolloff siso sj slm sm smartcase smartindent smarttab smc smd sn so softtabstop sol sp spc spell spellcapcheck spellfile spelllang spellsuggest spf spl splitbelow splitright spr sps sr srr ss ssl ssop st sta stal startofline statusline stl stmp sts su sua suffixes suffixesadd sw swapfile swapsync swb swf switchbuf sws sxq syn synmaxcol syntax ta tabline tabpagemax tabstop tag tagbsearch taglength tagrelative tags tagstack tal tb tbi tbidi tbis tbs tenc term termbidi termencoding terse textauto textmode textwidth tf tgst thesaurus tildeop timeout timeoutlen title titlelen titleold titlestring tl tm to toolbar toolbariconsize top tpm tr ts tsl tsr ttimeout ttimeoutlen ttm tty ttybuiltin ttyfast ttym ttymouse ttyscroll ttytype tw tx uc ul undolevels updatecount updatetime ut vb vbs vdir ve verbose verbosefile vfile vi viewdir viewoptions viminfo virtualedit visualbell vop wa wak warn wb wc wcm wd weirdinvert wfh wfw wh whichwrap wi wig wildchar wildcharm wildignore wildmenu wildmode wildoptions wim winaltkeys window winfixheight winfixwidth winheight winminheight winminwidth winwidth wiv wiw wm wmh wmnu wmw wop wrap wrapmargin wrapscan write writeany writebackup writedelay ws ww 
 
 " vimOptions: These are the turn-off setting variants {{{2
-syn keyword vimOption contained	noacd noai noakm noallowrevins noaltkeymap noanti noantialias noar noarab noarabic noarabicshape noari noarshape noautochdir noautoindent noautoread noautowrite noautowriteall noaw noawa nobackup noballooneval nobeval nobin nobinary nobiosk nobioskey nobk nobl nobomb nobuflisted nocf noci nocin nocindent nocompatible noconfirm noconsk noconskey nocopyindent nocp nocscopetag nocscopeverbose nocst nocsverb nocuc nocul nocursorcolumn nocursorline nodeco nodelcombine nodg nodiff nodigraph nodisable noea noeb noed noedcompatible noek noendofline noeol noequalalways noerrorbells noesckeys noet noex noexpandtab noexrc nofen nofk nofkmap nofoldenable nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkmapp nohkp nohls nohlsearch noic noicon noignorecase noim noimc noimcmdline noimd noincsearch noinf noinfercase noinsertmode nois nojoinspaces nojs nolazyredraw nolbr nolinebreak nolisp nolist noloadplugins nolpl nolz noma nomacatsui nomagic nomh noml nomod nomodeline nomodifiable nomodified nomore nomousef nomousefocus nomousehide nonu nonumber noopendevice* * nopaste nopi nopreserveindent nopreviewwindow noprompt nopvw noreadonly noremap norestorescreen norevins nori norightleft norightleftcmd norl norlc noro nors noru noruler nosb nosc noscb noscrollbind noscs nosecure nosft noshellslash noshelltemp noshiftround noshortname noshowcmd noshowfulltag noshowmatch noshowmode nosi nosm nosmartcase nosmartindent nosmarttab nosmd nosn nosol nospell nosplitbelow nosplitright nospr nosr nossl nosta nostartofline nostmp noswapfile noswf nota notagbsearch notagrelative notagstack notbi notbidi notbs notermbidi noterse notextauto notextmode notf notgst notildeop notimeout notitle noto notop notr nottimeout nottybuiltin nottyfast notx novb novisualbell nowa nowarn nowb noweirdinvert nowfh nowfw nowildmenu nowinfixheight nowinfixwidth nowiv nowmnu nowrap nowrapscan nowrite nowriteany nowritebackup nows 
+syn keyword vimOption contained	noacd noai noakm noallowrevins noaltkeymap noanti noantialias noar noarab noarabic noarabicshape noari noarshape noautochdir noautoindent noautoread noautowrite noautowriteall noaw noawa nobackup noballooneval nobeval nobin nobinary nobiosk nobioskey nobk nobl nobomb nobuflisted nocf noci nocin nocindent nocompatible noconfirm noconsk noconskey nocopyindent nocp nocscopetag nocscopeverbose nocst nocsverb nocuc nocul nocursorcolumn nocursorline nodeco nodelcombine nodg nodiff nodigraph nodisable noea noeb noed noedcompatible noek noendofline noeol noequalalways noerrorbells noesckeys noet noex noexpandtab noexrc nofen nofk nofkmap nofoldenable nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkmapp nohkp nohls nohlsearch noic noicon noignorecase noim noimc noimcmdline noimd noincsearch noinf noinfercase noinsertmode nois nojoinspaces nojs nolazyredraw nolbr nolinebreak nolisp nolist noloadplugins nolpl nolz noma nomacatsui nomagic nomh noml nomod nomodeline nomodifiable nomodified nomore nomousef nomousefocus nomousehide nonu nonumber noodev noopendevice nopaste nopi nopreserveindent nopreviewwindow noprompt nopvw noreadonly noremap norestorescreen norevins nori norightleft norightleftcmd norl norlc noro nors noru noruler nosb nosc noscb noscrollbind noscs nosecure nosft noshellslash noshelltemp noshiftround noshortname noshowcmd noshowfulltag noshowmatch noshowmode nosi nosm nosmartcase nosmartindent nosmarttab nosmd nosn nosol nospell nosplitbelow nosplitright nospr nosr nossl nosta nostartofline nostmp noswapfile noswf nota notagbsearch notagrelative notagstack notbi notbidi notbs notermbidi noterse notextauto notextmode notf notgst notildeop notimeout notitle noto notop notr nottimeout nottybuiltin nottyfast notx novb novisualbell nowa nowarn nowb noweirdinvert nowfh nowfw nowildmenu nowinfixheight nowinfixwidth nowiv nowmnu nowrap nowrapscan nowrite nowriteany nowritebackup nows 
 
 " vimOptions: These are the invertible variants {{{2
-syn keyword vimOption contained	invacd invai invakm invallowrevins invaltkeymap invanti invantialias invar invarab invarabic invarabicshape invari invarshape invautochdir invautoindent invautoread invautowrite invautowriteall invaw invawa invbackup invballooneval invbeval invbin invbinary invbiosk invbioskey invbk invbl invbomb invbuflisted invcf invci invcin invcindent invcompatible invconfirm invconsk invconskey invcopyindent invcp invcscopetag invcscopeverbose invcst invcsverb invcuc invcul invcursorcolumn invcursorline invdeco invdelcombine invdg invdiff invdigraph invdisable invea inveb inved invedcompatible invek invendofline inveol invequalalways inverrorbells invesckeys invet invex invexpandtab invexrc invfen invfk invfkmap invfoldenable invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkmapp invhkp invhls invhlsearch invic invicon invignorecase invim invimc invimcmdline invimd invincsearch invinf invinfercase invinsertmode invis invjoinspaces invjs invlazyredraw invlbr invlinebreak invlisp invlist invloadplugins invlpl invlz invma invmacatsui invmagic invmh invml invmod invmodeline invmodifiable invmodified invmore invmousef invmousefocus invmousehide invnu invnumber invopendevice* * invpaste invpi invpreserveindent invpreviewwindow invprompt invpvw invreadonly invremap invrestorescreen invrevins invri invrightleft invrightleftcmd invrl invrlc invro invrs invru invruler invsb invsc invscb invscrollbind invscs invsecure invsft invshellslash invshelltemp invshiftround invshortname invshowcmd invshowfulltag invshowmatch invshowmode invsi invsm invsmartcase invsmartindent invsmarttab invsmd invsn invsol invspell invsplitbelow invsplitright invspr invsr invssl invsta invstartofline invstmp invswapfile invswf invta invtagbsearch invtagrelative invtagstack invtbi invtbidi invtbs invtermbidi invterse invtextauto invtextmode invtf invtgst invtildeop invtimeout invtitle invto invtop invtr invttimeout invttybuiltin invttyfast invtx invvb invvisualbell invwa invwarn invwb invweirdinvert invwfh invwfw invwildmenu invwinfixheight invwinfixwidth invwiv invwmnu invwrap invwrapscan invwrite invwriteany invwritebackup invws 
+syn keyword vimOption contained	invacd invai invakm invallowrevins invaltkeymap invanti invantialias invar invarab invarabic invarabicshape invari invarshape invautochdir invautoindent invautoread invautowrite invautowriteall invaw invawa invbackup invballooneval invbeval invbin invbinary invbiosk invbioskey invbk invbl invbomb invbuflisted invcf invci invcin invcindent invcompatible invconfirm invconsk invconskey invcopyindent invcp invcscopetag invcscopeverbose invcst invcsverb invcuc invcul invcursorcolumn invcursorline invdeco invdelcombine invdg invdiff invdigraph invdisable invea inveb inved invedcompatible invek invendofline inveol invequalalways inverrorbells invesckeys invet invex invexpandtab invexrc invfen invfk invfkmap invfoldenable invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkmapp invhkp invhls invhlsearch invic invicon invignorecase invim invimc invimcmdline invimd invincsearch invinf invinfercase invinsertmode invis invjoinspaces invjs invlazyredraw invlbr invlinebreak invlisp invlist invloadplugins invlpl invlz invma invmacatsui invmagic invmh invml invmod invmodeline invmodifiable invmodified invmore invmousef invmousefocus invmousehide invnu invnumber invodev invopendevice invpaste invpi invpreserveindent invpreviewwindow invprompt invpvw invreadonly invremap invrestorescreen invrevins invri invrightleft invrightleftcmd invrl invrlc invro invrs invru invruler invsb invsc invscb invscrollbind invscs invsecure invsft invshellslash invshelltemp invshiftround invshortname invshowcmd invshowfulltag invshowmatch invshowmode invsi invsm invsmartcase invsmartindent invsmarttab invsmd invsn invsol invspell invsplitbelow invsplitright invspr invsr invssl invsta invstartofline invstmp invswapfile invswf invta invtagbsearch invtagrelative invtagstack invtbi invtbidi invtbs invtermbidi invterse invtextauto invtextmode invtf invtgst invtildeop invtimeout invtitle invto invtop invtr invttimeout invttybuiltin invttyfast invtx invvb invvisualbell invwa invwarn invwb invweirdinvert invwfh invwfw invwildmenu invwinfixheight invwinfixwidth invwiv invwmnu invwrap invwrapscan invwrite invwriteany invwritebackup invws 
 
 " termcap codes (which can also be set) {{{2
 syn keyword vimOption contained	t_AB t_AF t_al t_AL t_bc t_cd t_ce t_Ce t_cl t_cm t_Co t_cs t_Cs t_CS t_CV t_da t_db t_dl t_DL t_EI t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RI t_RV t_Sb t_se t_Sf t_SI t_so t_sr t_te t_ti t_ts t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xs t_ZH t_ZR 
@@ -44,7 +44,7 @@ syn keyword vimErrSetting contained	hardtabs ht w1200 w300 w9600
 
 " AutoCmd Events {{{2
 syn case ignore
-syn keyword vimAutoEvent contained	BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CursorHold CursorHoldI CursorMoved CursorMovedI EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter InsertChange InsertEnter InsertLeave MenuPopup QuickFixCmdPost QuickFixCmdPre RemoteReply SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabEnter TabLeave TermChanged TermResponse User UserGettingBored VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave 
+syn keyword vimAutoEvent contained	BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CursorHold CursorHoldI CursorMoved CursorMovedI EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertEnter InsertLeave MenuPopup QuickFixCmdPost QuickFixCmdPre RemoteReply SessionLoadPost ShellCmdPost ShellFilterPost SourceCmd SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabEnter TabLeave TermChanged TermResponse User UserGettingBored VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave 
 
 " Highlight commonly used Groupnames {{{2
 syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo 
@@ -470,7 +470,7 @@ syn match vimCtrlChar	"[
--]"
 " Beginners - Patterns that involve ^ {{{2
 " =========
 syn match  vimLineComment	+^[ \t:]*".*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
-syn match  vimCommentTitle	'"\s*\%([sS]:\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
+syn match  vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
 syn match  vimContinue	"^\s*\\"
 syn region vimString	start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
 syn match  vimCommentTitleLeader	'"\s\+'ms=s+1	contained
diff --git a/src/gui.c b/src/gui.c
index a7ae72234..a6e765559 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1969,7 +1969,7 @@ gui_screenstr(off, len, flags, fg, bg, back)
  * "flags":
  * GUI_MON_IS_CURSOR should only be used when this function is being called to
  * actually draw (an inverted) cursor.
- * GUI_MON_TRS_CURSOR is used to draw the cursor text with a transparant
+ * GUI_MON_TRS_CURSOR is used to draw the cursor text with a transparent
  * background.
  * GUI_MON_NOCLEAR is used to avoid clearing the selection when drawing over
  * it.
@@ -2179,7 +2179,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
     if (hl_mask_todo & HL_UNDERCURL)
 	draw_flags |= DRAW_UNDERC;
 
-    /* Do we draw transparantly? */
+    /* Do we draw transparently? */
     if (flags & GUI_MON_TRS_CURSOR)
 	draw_flags |= DRAW_TRANSP;
 
@@ -2675,7 +2675,7 @@ gui_wait_for_chars(wtime)
     }
 
     /*
-     * While we are waiting indefenitely for a character, blink the cursor.
+     * While we are waiting indefinitely for a character, blink the cursor.
      */
     gui_mch_start_blink();
 
diff --git a/src/gui.h b/src/gui.h
index 14b8d3fa3..719b8b5cb 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -147,7 +147,7 @@
 #define GUI_MON_NOCLEAR		0x10	/* don't clear selection */
 
 /* Flags for gui_mch_draw_string() */
-#define DRAW_TRANSP		0x01	/* draw with transparant bg */
+#define DRAW_TRANSP		0x01	/* draw with transparent bg */
 #define DRAW_BOLD		0x02	/* draw bold text */
 #define DRAW_UNDERL		0x04	/* draw underline text */
 #define DRAW_UNDERC		0x08	/* draw undercurl text */
@@ -343,9 +343,9 @@ typedef struct Gui
     guicolor_T	def_norm_pixel;	    /* default Color of normal text */
 
 #ifdef FEAT_GUI_X11
-    char	*rsrc_menu_fg_name;	/* Color of menu and dialog foregound */
+    char	*rsrc_menu_fg_name;	/* Color of menu & dialog foreground */
     guicolor_T	menu_fg_pixel;		/* Same in Pixel format */
-    char	*rsrc_menu_bg_name;	/* Color of menu and dialog backgound */
+    char	*rsrc_menu_bg_name;	/* Color of menu & dialog background */
     guicolor_T	menu_bg_pixel;		/* Same in Pixel format */
     char	*rsrc_scroll_fg_name;	/* Color of scrollbar foreground */
     guicolor_T	scroll_fg_pixel;	/* Same in Pixel format */
diff --git a/src/macros.h b/src/macros.h
index a8bc2b852..400f77128 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -188,7 +188,7 @@
 /*
  * It is possible to force some record format with:
  * #  define mch_open(n, m, p) open(vms_fixfilename(n), (m), (p)), "rat=cr", "rfm=stmlf", "mrs=0")
- * but it is not recomended, because it can destroy indexes etc.
+ * but it is not recommended, because it can destroy indexes etc.
  */
 #  define mch_open(n, m, p)	open(vms_fixfilename(n), (m), (p))
 # else
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 27bd3d8f8..537568956 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -2399,7 +2399,7 @@ mch_resolve_shortcut(char_u *fname)
     // full path string must be in Unicode.
     MultiByteToWideChar(CP_ACP, 0, fname, -1, wsz, MAX_PATH);
 
-    // "load" the name and resove the link
+    // "load" the name and resolve the link
     hr = ppf->lpVtbl->Load(ppf, wsz, STGM_READ);
     if (hr != S_OK)
 	goto shortcut_error;
diff --git a/src/os_win32.c b/src/os_win32.c
index eba043db7..1bd3d4aec 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3800,7 +3800,7 @@ standend(void)
 
 
 /*
- * Set normal fg/bg color, based on T_ME.  Called whem t_me has been set.
+ * Set normal fg/bg color, based on T_ME.  Called when t_me has been set.
  */
     void
 mch_set_normal_colors(void)