updated for version 7.0f03v7.0f03

17 files changed, 721 insertions, 283 deletions

diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index ac155c81ca..cfeeec67a4 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0f.  Last change: 2006 Apr 26
+*syntax.txt*	For Vim version 7.0f.  Last change: 2006 Apr 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2654,6 +2654,14 @@ for external scripting languages (currently perl, python, ruby, and tcl).
 					 scripting languages will not be
 					 loaded.
 
+Not all error highlighting that syntax/vim.vim does may be correct; VimL is a
+difficult language to highlight correctly.  A way to suppress error
+highlighting is to put: >
+
+	let g:vimsyntax_noerror = 1
+
+in your |vimrc|.
+
 
 XF86CONFIG				*xf86conf.vim* *ft-xf86conf-syntax*
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index b4d81e342f..d2af818b63 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1711,7 +1711,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :Explore	pi_netrw.txt	/*:Explore*
 :Hexplore	pi_netrw.txt	/*:Hexplore*
 :Man	filetype.txt	/*:Man*
-:MkVimball	vimball.txt	/*:MkVimball*
+:MkVimball	pi_vimball.txt	/*:MkVimball*
 :N	editing.txt	/*:N*
 :Nexplore	pi_netrw.txt	/*:Nexplore*
 :Next	editing.txt	/*:Next*
@@ -4255,7 +4255,7 @@ VimEnter	autocmd.txt	/*VimEnter*
 VimLeave	autocmd.txt	/*VimLeave*
 VimLeavePre	autocmd.txt	/*VimLeavePre*
 VimResized	autocmd.txt	/*VimResized*
-Vimball-copyright	vimball.txt	/*Vimball-copyright*
+Vimball-copyright	pi_vimball.txt	/*Vimball-copyright*
 Virtual-Replace-mode	insert.txt	/*Virtual-Replace-mode*
 VisVim	if_ole.txt	/*VisVim*
 Visual	visual.txt	/*Visual*
@@ -6519,6 +6519,7 @@ pi_netrw.txt	pi_netrw.txt	/*pi_netrw.txt*
 pi_paren.txt	pi_paren.txt	/*pi_paren.txt*
 pi_spec.txt	pi_spec.txt	/*pi_spec.txt*
 pi_tar.txt	pi_tar.txt	/*pi_tar.txt*
+pi_vimball.txt	pi_vimball.txt	/*pi_vimball.txt*
 pi_zip.txt	pi_zip.txt	/*pi_zip.txt*
 plaintex.vim	syntax.txt	/*plaintex.vim*
 plsql	sql.txt	/*plsql*
@@ -7639,13 +7640,12 @@ vim-script-intro	usr_41.txt	/*vim-script-intro*
 vim-variable	eval.txt	/*vim-variable*
 vim.vim	syntax.txt	/*vim.vim*
 vim:	options.txt	/*vim:*
-vimball	vimball.txt	/*vimball*
-vimball-contents	vimball.txt	/*vimball-contents*
-vimball-extract	vimball.txt	/*vimball-extract*
-vimball-history	vimball.txt	/*vimball-history*
-vimball-manual	vimball.txt	/*vimball-manual*
-vimball-vimballlist	vimball.txt	/*vimball-vimballlist*
-vimball.txt	vimball.txt	/*vimball.txt*
+vimball	pi_vimball.txt	/*vimball*
+vimball-contents	pi_vimball.txt	/*vimball-contents*
+vimball-extract	pi_vimball.txt	/*vimball-extract*
+vimball-history	pi_vimball.txt	/*vimball-history*
+vimball-manual	pi_vimball.txt	/*vimball-manual*
+vimball-vimballlist	pi_vimball.txt	/*vimball-vimballlist*
 vimdev	intro.txt	/*vimdev*
 vimdiff	diff.txt	/*vimdiff*
 vimfiles	options.txt	/*vimfiles*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 5f7968a999..9bad168025 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0f.  Last change: 2006 Apr 26
+*todo.txt*      For Vim version 7.0f.  Last change: 2006 Apr 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,6 +30,9 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+GTK: tooltips make menu actions use wrong tab page. Yegappan will look into
+it.
+
 Add more tests for all new functionality in Vim 7.  Especially new functions.
 
 Darren Hiebert is including the patch for omni completion in ctags.  A new
@@ -2349,6 +2352,7 @@ Text objects:
 8   Add text object for any kind of parens, also multi-byte ones.
 7   Add text object for current search pattern: "a/" and "i/".  Makes it
     possible to turn text highlighted for 'hlsearch' into a Visual area.
+8   Add a way to make an ":omap" for a user-defined text object.
 8   Add "gp" and "gP" commands: insert text and make sure there is a single
     space before it, unless at the start of the line, and after it, unless at
     the end of the line or before a ".".
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 10e54bbda1..820aa928b6 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0f.  Last change: 2006 Apr 26
+*version7.txt*  For Vim version 7.0f.  Last change: 2006 Apr 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -893,6 +893,7 @@ arch ftplugin file. (Nikolai Weibull)
 asterisk and asteriskvm syntax file. (Tilghman Lesher)
 BDF ftplugin file. (Nikolai Weibull)
 BibTeX indent file. (Dorai Sitaram)
+BibTeX Bibliography Style syntax file. (Tim Pope)
 BTM ftplugin file. (Bram Moolenaar)
 calendar ftplugin file. (Nikolai Weibull)
 Changelog indent file. (Nikolai Weibull)
@@ -913,6 +914,7 @@ elinks ftplugin file. (Nikolai Weibull)
 eterm ftplugin file. (Nikolai Weibull)
 eviews syntax file. (Vaidotas Zemlys)
 fetchmail RC ftplugin file. (Nikolai Weibull)
+FlexWiki syntax and ftplugin file. (George Reilly)
 Generic indent file. (Dave Silvia)
 gpg ftplugin file. (Nikolai Weibull)
 gretl syntax file. (Vaidotas Zemlys)
@@ -939,6 +941,7 @@ Maxima syntax file. (Robert Dodier)
 MGL syntax file. (Gero Kuhlmann)
 modconf ftplugin file. (Nikolai Weibull)
 mplayer config ftplugin file. (Nikolai Weibull)
+Mrxvtrc syntax and ftplugin file. (Gautam Iyer)
 MuPAD source syntax, indent and ftplugin. (Dave Silvia)
 mutt RC ftplugin file. (Nikolai Weibull)
 nanorc syntax and ftplugin file. (Nikolai Weibull)
@@ -2616,7 +2619,7 @@ Win32: The height of the tab page labels is now adjusted to the font height.
 
 Win32: selecting the tab label was off by one. (Yegappan Lakshmanan)
 
-Added tooltips for Motif tab page labels. (Yegappan Lakshmanan)
+Added tooltips for Motif and GTK tab page labels. (Yegappan Lakshmanan)
 
 When 'encoding' is "utf-8" then ":help spell" would report an illegal byte and
 the file was not converted from latin1 to utf-8.  Now retry with latin1 if
@@ -2661,5 +2664,18 @@ Win32: Dropping a shortcut on the Vim icon did't edit the referred file like
 editing it in another way would.  Use fname_expand() in buf_set_name() instead
 of simply make the file name a full path.
 
+Using feedkeys() could cause Vim to hang.
+
+When closing another tab page from the tabline menu in Insert mode the tabline
+was not updated right away.
+
+The syntax menu didn't work in compatible mode.
+
+After using ":ta id" twice with the same "id", ":ts" and then ":pop" a ":ts"
+reported no matching tag.  Clear the cached tag name.
+
+In Insert mode the matchparen plugin highlighted the wrong paren when there is
+a string just next to a paren.
+
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/vimball.txt b/runtime/doc/vimball.txt
deleted file mode 100644
index ce8bc49c12..0000000000
--- a/runtime/doc/vimball.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-*vimball.txt*	For Vim version 7.0f.  Last change: 2006 Apr 25
-
-	Vimball Archiver
-
-Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
-	  (remove NOSPAM from Campbell's email first)
-Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.	*Vimball-copyright*
-           The VIM LICENSE applies to Vimball.vim, and Vimball.txt
-           (see |copyright|) except use "Vimball" instead of "Vim".
-	   No warranty, express or implied.
-	   Use At-Your-Own-Risk!
-
-==============================================================================
-1. Contents					*vimball* *vimball-contents*
-
-	1. Contents......................................: |vimball-contents|
-	2. Vimball Manual................................: |vimball-manual|
-	3. Vimball History...............................: |vimball-history|
-
-
-==============================================================================
-2. Vimball Manual					*vimball-manual*
-
-							*:MkVimball*
-		:[range]MkVimball[!] filename
-
-	This command takes lines holding a path to files to be included in
-	your vimball; as an example: >
-		plugin/something.vim
-		doc/something.txt
-<	using MkVimball on this range will create a file called
-	"filename.vba" which can be used by Vimball.vim to re-create these
-	files.  If the "filename.vba" file already exists, then MkVimball
-	will issue a warning and not create the file.
-
-	However, if you use the exclamation point (!), then MkVimball will
-	create the "filename.vba" file, overwriting it if it already exists.
-	This behavior resembles that for |:w|.
-
-							*vimball-extract*
-		vim filename.vba
-
-	Simply editing a Vimball will cause Vimball.vim to tell the user to
-	source the file to extract its contents.
-
-	Extraction will only proceed if the first line of a putative vimball
-	file holds the "Vimball Archiver by Charles E.  Campbell, Jr., Ph.D."
-	line.
-
-		:VimballList				*vimball-vimballlist*
-	
-	This command will tell Vimball to list the files in the archive, along
-	with their lengths in lines.
-
-
-==============================================================================
-3. Vimball History					*vimball-history*
-
-	7  : Apr 25, 2006 * bypasses foldenable
-	                  * uses more exe and less norm! (:yank :put etc)
-			  * does better at insuring a "Press ENTER" prompt
-			    appears to keep its messages visible
-	4  : Mar 31, 2006 * BufReadPost seems to fire twice; BufReadEnter
-	                    only fires once, so the "Source this file..."
-			    message is now issued only once.
-	3  : Mar 20, 2006 * removed query, now requires sourcing to be
-	                    extracted (:so %).  Message to that effect
-			    included.
-			  * :VimballList  now shows files that would be
-			    extracted.
-	2  : Mar 20, 2006 * query, :UseVimball included
-	1  : Mar 20, 2006 * initial release
-
-
-==============================================================================
-vim:tw=78:ts=8:ft=help:fdm=marker
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 617cbe6dd9..3b5bd4fdbc 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Apr 21
+" Last Change:	2006 Apr 27
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -250,6 +250,9 @@ au BufNewFile,BufRead *.bdf			setf bdf
 " BibTeX bibliography database file
 au BufNewFile,BufRead *.bib			setf bib
 
+" BibTeX Bibliography Style
+au BufNewFile,BufRead *.bst			setf bst
+
 " BIND configuration
 au BufNewFile,BufRead named.conf,rndc.conf	setf named
 
@@ -597,6 +600,9 @@ au BufNewFile,BufRead *.factor			setf factor
 " Fetchmail RC file
 au BufNewFile,BufRead .fetchmailrc		setf fetchmail
 
+" FlexWiki
+au BufNewFile,BufRead *.wiki			setf flexwiki
+
 " Focus Executable
 au BufNewFile,BufRead *.fex,*.focexec		setf focexec
 
@@ -991,6 +997,9 @@ au BufNewFile,BufRead mplayer.conf,*/.mplayer/config	setf mplayerconf
 " Moterola S record
 au BufNewFile,BufRead *.s19,*.s28,*.s37		setf srec
 
+" Mrxvtrc
+au BufNewFile,BufRead mrxvtrc,.mrxvtrc		setf mrxvtrc
+
 " Msql
 au BufNewFile,BufRead *.msql			setf msql
 
diff --git a/runtime/ftplugin/mrxvtrc.vim b/runtime/ftplugin/mrxvtrc.vim
new file mode 100644
index 0000000000..d1313bc205
--- /dev/null
+++ b/runtime/ftplugin/mrxvtrc.vim
@@ -0,0 +1,14 @@
+" Created	: Wed 26 Apr 2006 01:20:53 AM CDT
+" Modified	: Thu 27 Apr 2006 03:29:13 AM CDT
+" Author	: Gautam Iyer <gi1242@users.sourceforge.net>
+" Description	: ftplugin for mrxvtrc
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:! commentstring=!\ %s formatoptions-=t formatoptions+=croql
+
diff --git a/runtime/syntax/bst.vim b/runtime/syntax/bst.vim
new file mode 100644
index 0000000000..3feefec37b
--- /dev/null
+++ b/runtime/syntax/bst.vim
@@ -0,0 +1,85 @@
+" Vim syntax file
+" Language:     BibTeX Bibliography Style
+" Maintainer:   Tim Pope <vim@rebelongto.us>
+" Last Change:  2006 Apr 27
+" Filenames:    *.bst
+" $Id$
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+    syntax clear
+elseif exists("b:current_syntax")
+    finish
+endif
+
+if version < 600
+    command -nargs=1 SetIsk set iskeyword=<args>
+else
+    command -nargs=1 SetIsk setlocal iskeyword=<args>
+endif
+SetIsk 48-57,#,$,',.,A-Z,a-z
+delcommand SetIsk
+
+syn case ignore
+
+syn region  bstString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=bstField,bstType
+syn match   bstNumber         "#-\=\d\+\>"
+syn keyword bstNumber         entry.max$ global.max$
+syn match   bstComment        "%.*"
+
+syn keyword bstCommand        ENTRY FUNCTION INTEGERS MACRO STRINGS
+syn keyword bstCommand        READ EXECUTE ITERATE REVERSE SORT
+syn match   bstBuiltIn        "\s[-<>=+*]\|\s:="
+syn keyword bstBuiltIn        add.period$
+syn keyword bstBuiltIn        call.type$ change.case$ chr.to.int$ cite$
+syn keyword bstBuiltIn        duplicate$ empty$ format.name$
+syn keyword bstBuiltIn        if$ int.to.chr$ int.to.str$
+syn keyword bstBuiltIn        missing$
+syn keyword bstBuiltIn        newline$ num.names$
+syn keyword bstBuiltIn        pop$ preamble$ purify$ quote$
+syn keyword bstBuiltIn        skip$ stack$ substring$ swap$
+syn keyword bstBuiltIn        text.length$ text.prefix$ top$ type$
+syn keyword bstBuiltIn        warning$ while$ width$ write$
+syn match   bstIdentifier     "'\k*"
+syn keyword bstType           article book booklet conference
+syn keyword bstType           inbook incollection inproceedings
+syn keyword bstType           manual mastersthesis misc
+syn keyword bstType           phdthesis proceedings
+syn keyword bstType           techreport unpublished
+syn keyword bstField          abbr address annote author
+syn keyword bstField          booktitle chapter crossref comment
+syn keyword bstField          edition editor
+syn keyword bstField          howpublished institution journal key month
+syn keyword bstField          note number
+syn keyword bstField          organization
+syn keyword bstField          pages publisher
+syn keyword bstField          school series
+syn keyword bstField          title type
+syn keyword bstField          volume year
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_bst_syn_inits")
+    if version < 508
+        let did_bst_syn_inits = 1
+        command -nargs=+ HiLink hi link <args>
+    else
+        command -nargs=+ HiLink hi def link <args>
+    endif
+
+    HiLink bstComment           Comment
+    HiLink bstString            String
+    HiLink bstCommand           PreProc
+    HiLink bstBuiltIn           Statement
+    HiLink bstField             Special
+    HiLink bstNumber            Number
+    HiLink bstType              Type
+    HiLink bstIdentifier        Identifier
+    delcommand HiLink
+endif
+
+let b:current_syntax = "bst"
+
+" vim:set ft=vim sts=4 sw=4:
diff --git a/runtime/syntax/esterel.vim b/runtime/syntax/esterel.vim
index 7498364214..cc3c4d7305 100644
--- a/runtime/syntax/esterel.vim
+++ b/runtime/syntax/esterel.vim
@@ -1,9 +1,10 @@
 " Vim syntax file
-" Language:		ESTEREL
-" Maintainer:	Maurizio Tranchero <mtranchero@yahoo.it>
-" Credits:		Luca Necchi	<luca.necchi@polito.it>
-" Last Change:	Tue May 17 23:49:39 CEST 2005
-" Version:		0.2
+" Language:			ESTEREL
+" Maintainer:		Maurizio Tranchero <maurizio.tranchero@polito.it> - <maurizio.tranchero@gmail.com>
+" Credits:			Luca Necchi	<luca.necchi@polito.it>
+" First Release:	Tue May 17 23:49:39 CEST 2005
+" Last Change:		Sat Apr 22 14:56:41 CEST 2006
+" Version:			0.5
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -16,30 +17,39 @@ endif
 " case is significant
 syn case ignore
 " Esterel Regions
-syn region esterelModule		start=/module/	end=/end module/	contains=ALLBUT,esterelModule
-syn region esterelLoop			start=/loop/	end=/end loop/		contains=ALLBUT,esterelModule
-syn region esterelAbort			start=/abort/	end=/end abort/		contains=ALLBUT,esterelModule
-syn region esterelEvery			start=/every/	end=/end every/		contains=ALLBUT,esterelModule
-syn region esterelIf			start=/if/		end=/end if/		contains=ALLBUT,esterelModule
-"syn region esterelConcurrent	start=/\[/		end=/\]/			contains=ALLBUT,esterelModule
-syn region esterelConcurrent	transparent start=/\[/		end=/\]/		contains=ALLBUT,esterelModule
-syn region esterelIfThen		start=/if/		end=/then/			oneline
-" and weak abort? how to make vim know that start='weak abort'?
+syn region esterelModule					start=/module/		end=/end module/	contains=ALLBUT,esterelModule
+syn region esterelLoop						start=/loop/		end=/end loop/		contains=ALLBUT,esterelModule
+syn region esterelAbort						start=/abort/		end=/when/			contains=ALLBUT,esterelModule
+syn region esterelAbort						start=/weak abort/	end=/when/			contains=ALLBUT,esterelModule
+syn region esterelEvery						start=/every/		end=/end every/		contains=ALLBUT,esterelModule
+syn region esterelIf						start=/if/			end=/end if/		contains=ALLBUT,esterelModule
+syn region esterelConcurrent	transparent start=/\[/			end=/\]/			contains=ALLBUT,esterelModule
+syn region esterelIfThen					start=/if/			end=/then/			oneline
 " Esterel Keywords
-syn keyword esterelStatement	module signal end
-syn keyword esterelIO			input output 
+syn keyword esterelIO			input output inputoutput constant
+syn keyword esterelBoolean		and or not xor xnor nor nand
+syn keyword esterelExpressions	mod 
+syn keyword esterelStatement	nothing halt
+syn keyword esterelStatement	module signal sensor end
 syn keyword esterelStatement	every do loop abort weak
 syn keyword esterelStatement	emit present await
-syn keyword esterelStatement	if then else
-syn keyword esterelBoolean		and or not xor xnor nor nand
-"syn keyword esterelOperator		\[ \] 
-syn keyword esterelPippo		pippo
+syn keyword esterelStatement	pause when immediate
+syn keyword esterelStatement	if then else case
+syn keyword esterelStatement	var in  run  suspend
+syn keyword esterelStatement	repeat times combine with
+syn keyword esterelStatement	assert sustain
+" check what it is the following
+syn keyword esterelStatement	relation						
+syn keyword esterelFunctions	function procedure task
+syn keyword esterelSysCall		call trap exit exec
 " Esterel Types
 syn keyword esterelType integer float bolean
 " Esterel Comment
 syn match esterelComment	"%.*$"
 " Operators and special characters
 syn match esterelSpecial	":"
+syn match esterelSpecial	"<="
+syn match esterelSpecial	">="
 syn match esterelSpecial	";"
 syn match esterelOperator	"\["
 syn match esterelOperator	"\]"
@@ -57,13 +67,16 @@ if version >= 508 || !exists("did_esterel_syntax_inits")
     command -nargs=+ HiLink hi def link <args>
   endif
 
-	HiLink esterelStatement	Statement
-	HiLink esterelType		Type
-	HiLink esterelComment	Comment
-	HiLink esterelBoolean	Number
-	HiLink esterelIO		String
-	HiLink esterelOperator	Type
-	HiLink esterelSpecial	Special
+	HiLink esterelStatement		Statement
+	HiLink esterelType			Type
+	HiLink esterelComment		Comment
+	HiLink esterelBoolean		Number
+	HiLink esterelExpressions	Number
+	HiLink esterelIO			String
+	HiLink esterelOperator		Type
+	HiLink esterelSysCall		Type
+	HiLink esterelFunctions		Type
+	HiLink esterelSpecial		Special
 
   delcommand HiLink
 endif
diff --git a/runtime/syntax/flexwiki.vim b/runtime/syntax/flexwiki.vim
new file mode 100644
index 0000000000..34f893d927
--- /dev/null
+++ b/runtime/syntax/flexwiki.vim
@@ -0,0 +1,135 @@
+" Vim syntax file
+" Language:     FlexWiki, http://www.flexwiki.com/
+" Maintainer:   George V. Reilly  <george@reilly.org>
+" Home:         http://www.georgevreilly.com/vim/flexwiki/
+" Other Home:   http://www.vim.org/scripts/script.php?script_id=1529
+" Author:       George V. Reilly
+" Filenames:    *.wiki
+" Last Change: Wed Apr 26 11:00 PM 2006 P
+" Version:      0.3
+
+" Note: The horrible regexps were reverse-engineered from
+" FlexWikiCore\EngineSource\Formatter.cs, with help from the Regex Analyzer
+" in The Regulator, http://regulator.sourceforge.net/  .NET uses Perl-style
+" regexes, which use a different syntax than Vim (fewer \s).
+" The primary test case is FlexWiki\FormattingRules.wiki
+
+" Quit if syntax file is already loaded
+if version < 600
+    syntax clear
+elseif exists("b:current_syntax")
+    finish
+endif
+
+" A WikiWord (unqualifiedWikiName)
+syntax match  flexwikiWord          /\%(_\?\([A-Z]\{2,}[a-z0-9]\+[A-Za-z0-9]*\)\|\([A-Z][a-z0-9]\+[A-Za-z0-9]*[A-Z]\+[A-Za-z0-9]*\)\)/
+" A [bracketed wiki word]
+syntax match  flexwikiWord          /\[[[:alnum:]\s]\+\]/
+
+" text: "this is a link (optional tooltip)":http://www.microsoft.com
+" TODO: check URL syntax against RFC
+syntax match flexwikiLink           `\("[^"(]\+\((\([^)]\+\))\)\?":\)\?\(https\?\|ftp\|gopher\|telnet\|file\|notes\|ms-help\):\(\(\(//\)\|\(\\\\\)\)\+[A-Za-z0-9:#@%/;$~_?+-=.&\-\\\\]*\)`
+
+" text: *strong* 
+syntax match flexwikiBold           /\(^\|\W\)\zs\*\([^ ].\{-}\)\*/
+" '''bold'''
+syntax match flexwikiBold           /'''\([^'].\{-}\)'''/
+
+" text: _emphasis_
+syntax match flexwikiItalic         /\(^\|\W\)\zs_\([^ ].\{-}\)_/
+" ''italic''
+syntax match flexwikiItalic         /''\([^'].\{-}\)''/
+
+" ``deemphasis``
+syntax match flexwikiDeEmphasis     /``\([^`].\{-}\)``/
+
+" text: @code@ 
+syntax match flexwikiCode           /\(^\|\s\|(\|\[\)\zs@\([^@]\+\)@/
+
+"   text: -deleted text- 
+syntax match flexwikiDelText        /\(^\|\s\+\)\zs-\([^ <a ]\|[^ <img ]\|[^ -].*\)-/
+
+"   text: +inserted text+ 
+syntax match flexwikiInsText        /\(^\|\W\)\zs+\([^ ].\{-}\)+/
+
+"   text: ^superscript^ 
+syntax match flexwikiSuperScript    /\(^\|\W\)\zs^\([^ ].\{-}\)^/
+
+"   text: ~subscript~ 
+syntax match flexwikiSubScript      /\(^\|\W\)\zs\~\([^ ].\{-}\)\~/
+
+"   text: ??citation?? 
+syntax match flexwikiCitation       /\(^\|\W\)\zs??\([^ ].\{-}\)??/
+
+" Emoticons: must come after the Textilisms, as later rules take precedence
+" over earlier ones. This match is an approximation for the ~70 distinct
+" patterns that FlexWiki knows.
+syntax match flexwikiEmoticons      /\((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/
+
+" Aggregate all the regular text highlighting into flexwikiText
+syntax cluster flexwikiText contains=flexwikiItalic,flexwikiBold,flexwikiCode,flexwikiDeEmphasis,flexwikiDelText,flexwikiInsText,flexwikiSuperScript,flexwikiSubScript,flexwikiCitation,flexwikiLink,flexwikiWord,flexwikiEmoticons
+
+" single-line WikiPropertys
+syntax match flexwikiSingleLineProperty /^:\?[A-Z_][_a-zA-Z0-9]\+:/
+
+" TODO: multi-line WikiPropertys
+
+" Header levels, 1-6
+syntax match flexwikiH1             /^!.*$/
+syntax match flexwikiH2             /^!!.*$/
+syntax match flexwikiH3             /^!!!.*$/
+syntax match flexwikiH4             /^!!!!.*$/
+syntax match flexwikiH5             /^!!!!!.*$/
+syntax match flexwikiH6             /^!!!!!!.*$/
+
+" <hr>, horizontal rule
+syntax match flexwikiHR             /^----.*$/
+
+" Formatting can be turned off by ""enclosing it in pairs of double quotes""
+syntax match flexwikiEscape         /"".\{-}""/
+
+" Tables. Each line starts and ends with '||'; each cell is separated by '||'
+syntax match flexwikiTable          /||/
+
+" Bulleted list items start with one or tabs, followed by whitespace, then '*'
+" Numeric  list items start with one or tabs, followed by whitespace, then '1.'
+" Eight spaces at the beginning of the line is equivalent to the leading tab.
+syntax match flexwikiList           /^\(\t\| \{8}\)\s*\(\*\|1\.\).*$/   contains=@flexwikiText
+
+" Treat all other lines that start with spaces as PRE-formatted text.
+syntax match flexwikiPre            /^[ \t]\+[^ \t*1].*$/
+
+
+" Link FlexWiki syntax items to colors
+hi def link flexwikiH1                    Title
+hi def link flexwikiH2                    flexwikiH1
+hi def link flexwikiH3                    flexwikiH2
+hi def link flexwikiH4                    flexwikiH3
+hi def link flexwikiH5                    flexwikiH4
+hi def link flexwikiH6                    flexwikiH5
+hi def link flexwikiHR                    flexwikiH6
+    
+hi def flexwikiBold                       term=bold cterm=bold gui=bold
+hi def flexwikiItalic                     term=italic cterm=italic gui=italic
+
+hi def link flexwikiCode                  Statement
+hi def link flexwikiWord                  Underlined
+
+hi def link flexwikiEscape                Todo
+hi def link flexwikiPre                   PreProc
+hi def link flexwikiLink                  Underlined
+hi def link flexwikiList                  Type
+hi def link flexwikiTable                 Type
+hi def link flexwikiEmoticons             Constant
+hi def link flexwikiDelText               Comment
+hi def link flexwikiDeEmphasis            Comment
+hi def link flexwikiInsText               Constant
+hi def link flexwikiSuperScript           Constant
+hi def link flexwikiSubScript             Constant
+hi def link flexwikiCitation              Constant
+
+hi def link flexwikiSingleLineProperty    Identifier
+
+let b:current_syntax="FlexWiki"
+
+" vim:tw=0:
diff --git a/runtime/syntax/mrxvtrc.vim b/runtime/syntax/mrxvtrc.vim
new file mode 100644
index 0000000000..d3e3129317
--- /dev/null
+++ b/runtime/syntax/mrxvtrc.vim
@@ -0,0 +1,151 @@
+" Created	: Wed 26 Apr 2006 01:20:53 AM CDT
+" Modified	: Thu 27 Apr 2006 02:29:25 PM CDT
+" Author	: Gautam Iyer <gi1242@users.sourceforge.net>
+" Description	: Syntax file for mrxvtrc
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Define options.
+let s:boolOpts = '(highlightTabOnBell|syncTabTitle|hideTabbar|autohideTabbar|bottomTabbar|hideButtons|syncTabIcon|veryBoldFont|maximized|fullscreen|reverseVideo|loginShell|jumpScroll|scrollBar|scrollbarRight|scrollbarFloating|scrollTtyOutputInhibit|scrollTtyKeypress|scrollWithBuffer|transparent|transparentForce|transparentScrollbar|transparentMenubar|transparentTabbar|tabUsePixmap|utmpInhibit|visualBell|mapAlert|meta8|mouseWheelScrollPage|multibyte_cursor|tripleclickwords|showMenu|xft|xftNomFont|xftSlowOutput|xftAntialias|xftHinting|xftAutoHint|xftGlobalAdvance|tabShell|cmdAllTabs|cmdInitTabs|protectSecondary|thai|borderLess|overrideRedirect|holdExit|broadcast|smartResize|smoothResize|pointerBlank|cursorBlink|noSysConfig|disableMacros|linuxHomeEndKey|sessionMgt)'
+
+let s:colorOpts = '(vt\d+.(foreground|background)|background|foreground|ufBackground|textShadow|i?tab(Foreground|Background)|color([0-9]|1[0-5]|BD|UL|RV)|(scroll|trough|highlight|cursor|pointer|border|tint)Color|cursorColor2)'
+
+let s:numOpts = '(vt\d+.saveLines|maxTabWidth|minVisibleTabs|saveLines|scrollbarThickness|xftmSize|xftSize|desktop|externalBorder|internalBorder|lineSpace|pointerBlankDelay|cursorBlinkInterval|initTermNumber|shading|backgroundFade|bgRefreshInterval|fading|opacity|opacityDegree|xftPSize)'
+
+let s:strOpts = '(vt\d+\.(tabTitle|command)|tabTitle|termName|title|clientName|iconName|bellCommand|holdExitText|backspaceKey|deleteKey|printPipe|cutChars|answerbackString|smClientID|geometry|confFileSave|path|boldFont|m?font[1-5]?|xftFont|xftmFont|xftPFont|inputMethod|greektoggle_key|menu|menubarPixmap|vt\d+\.Pixmap|Pixmap|scrollbarPixmap|tabbarPixmap|appIcon|multichar_encoding)'
+
+syn case match
+
+syn match	mrxvtrcComment	contains=@Spell '^\s*!.*$'
+syn match	mrxvtrcComment	'\v^\s*!\s*\w+[.*]\w+.*:.*'
+
+"
+" Generic options (string / color / number / boolean)
+"
+syn match	mrxvtrcOptErr	'\v^\s*\w+[.*]?.{-}(:|$)'
+exec 'syn match	mrxvtrcBoolOpts	nextgroup=mrxvtrcBoolVal,mrxvtrcValErr'
+	    \ '"\v^\w+[.*]'.s:boolOpts.':\s*"'
+exec 'syn match	mrxvtrcNumOpts	nextgroup=mrxvtrcNumVal,mrxvtrcValErr'
+	    \ '"\v^\w+[.*]'.s:numOpts.':\s*"'
+exec 'syn match	mrxvtrcColorOpts	nextgroup=mrxvtrcColorVal'
+	    \ '"\v^\w+[.*]'.s:colorOpts.':\s*"'
+exec 'syn match	mrxvtrcStrOpts	nextgroup=mrxvtrcStrVal,mrxvtrcValErr'
+	    \ '"\v^\w+[.*]'.s:strOpts.':\s*"'
+
+syn case ignore
+
+syn match	mrxvtrcValErr	contained '\v.+$'
+syn keyword	mrxvtrcBoolVal	contained 0 1 yes no on off true false
+syn match	mrxvtrcStrVal	contained '\v.+$'
+syn match	mrxvtrcColorVal	contained '\v#[0-9a-f]{6}\s*$'
+syn match	mrxvtrcNumVal	contained '\v[+-]?(0[0-7]+|\d+|0x[0-9a-f]+)$'
+
+syn case match
+
+"
+" Options with special values
+"
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcSBstyle,mrxvtrcValErr
+				\ '\v^\w+[.*]scrollbarStyle:\s*'
+syn keyword	mrxvtrcSBstyle	contained plain xterm rxvt next sgi
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcSBalign,mrxvtrcValErr
+				\ '\v^\w+[.*]scrollbarAlign:\s*'
+syn keyword	mrxvtrcSBalign	contained top bottom
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcTSmode,mrxvtrcValErr
+				\ '\v^\w+[.*]textShadowMode:\s*'
+syn keyword	mrxvtrcTSmode	contained
+				\ none top bottom left right topleft topright
+				\ botleft botright
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcGrkKbd,mrxvtrcValErr
+				\ '\v^\w+[.*]greek_keyboard:\s*'
+syn keyword	mrxvtrcGrkKbd	contained iso ibm
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcXftWt,mrxvtrcValErr
+				\ '\v^\w+[.*]xftWeight:\s*'
+syn keyword	mrxvtrcXftWt	contained light medium bold
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcXftSl,mrxvtrcValErr
+				\ '\v^\w+[.*]xftSlant:\s*'
+syn keyword	mrxvtrcXftSl	contained roman italic oblique
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcXftWd,mrxvtrcValErr
+				\ '\v^\w+[.*]xftWidth:\s*'
+syn keyword	mrxvtrcXftWd	contained
+				\ ultracondensed ultraexpanded
+				\ condensed expanded normal
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcXftHt,mrxvtrcValErr
+				\ '\v^\w+[.*]xftRGBA:\s*'
+syn keyword	mrxvtrcXftHt	contained rgb bgr vrgb vbgr none
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcPedit,mrxvtrcValErr
+				\ '\v^\w+[.*]preeditType:\s*'
+syn keyword	mrxvtrcPedit	contained OverTheSpot OffTheSpot Root
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcMod,mrxvtrcValErr
+				\ '\v^\w+[.*]modifier:\s*'
+syn keyword	mrxvtrcMod	contained
+				\ alt meta hyper super mod1 mod2 mod3 mod4 mod5
+
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcSelSty,mrxvtrcValErr
+				\ '\v^\w+[.*]selectStyle:\s*'
+syn keyword	mrxvtrcSelSty	contained old oldword
+
+
+"
+" Macros
+"
+syn match	mrxvtrcOptions	nextgroup=mrxvtrcMacro,mrxvtrcValErr
+	    \ '\v\c^\w+[.*]macro.(primary\+)?((ctrl|alt|meta|shift)\+)*\w+:\s*'
+syn keyword	mrxvtrcMacro	contained nextgroup=mrxvtrcMacroArg
+				\ Dummy Esc Str NewTab Close GotoTab MoveTab
+				\ Scroll Copy Paste ToggleSubwin ResizeFont
+				\ ToggleVeryBold ToggleTransparency
+				\ ToggleBroadcast ToggleHold SetTitle
+				\ PrintScreen SaveConfig ToggleMacros
+syn match	mrxvtrcMacroArg	contained '.\+$'
+
+
+unlet s:strOpts s:boolOpts s:colorOpts s:numOpts
+
+"
+" Highlighting groups
+"
+hi def link mrxvtrcComment	Comment
+
+hi def link mrxvtrcBoolOpts	Statement
+hi def link mrxvtrcColorOpts	mrxvtrcBoolOpts
+hi def link mrxvtrcNumOpts	mrxvtrcBoolOpts
+hi def link mrxvtrcStrOpts	mrxvtrcBoolOpts
+hi def link mrxvtrcOptions	mrxvtrcBoolOpts
+
+hi def link mrxvtrcBoolVal	Boolean
+hi def link mrxvtrcStrVal	String
+hi def link mrxvtrcColorVal	Constant
+hi def link mrxvtrcNumVal	Number
+
+hi def link mrxvtrcSBstyle	mrxvtrcStrVal
+hi def link mrxvtrcSBalign	mrxvtrcStrVal
+hi def link mrxvtrcTSmode	mrxvtrcStrVal
+hi def link mrxvtrcGrkKbd	mrxvtrcStrVal
+hi def link mrxvtrcXftWt	mrxvtrcStrVal
+hi def link mrxvtrcXftSl	mrxvtrcStrVal
+hi def link mrxvtrcXftWd	mrxvtrcStrVal
+hi def link mrxvtrcXftHt	mrxvtrcStrVal
+hi def link mrxvtrcPedit	mrxvtrcStrVal
+hi def link mrxvtrcMod		mrxvtrcStrVal
+hi def link mrxvtrcSelSty	mrxvtrcStrVal
+
+hi def link mrxvtrcMacro	Identifier
+hi def link mrxvtrcMacroArg	String
+
+hi def link mrxvtrcOptErr	Error
+hi def link mrxvtrcValErr	Error
+
+let b:current_syntax = "mrxvtrc"
diff --git a/src/edit.c b/src/edit.c
index 30d4c3bfa9..296e91545c 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8379,8 +8379,10 @@ ins_tabline(c)
     if (c == K_TABLINE)
 	goto_tabpage(current_tab);
     else
+    {
 	handle_tabmenu();
-
+	redraw_statuslines();	/* will redraw the tabline when needed */
+    }
 }
 #endif
 
diff --git a/src/eval.c b/src/eval.c
index 2d85e6c2ae..6fa70c4f35 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9029,7 +9029,8 @@ f_feedkeys(argvars, rettv)
 	    ins_typebuf(keys_esc, (remap ? REMAP_YES : REMAP_NONE),
 					       typebuf.tb_len, !typed, FALSE);
 	    vim_free(keys_esc);
-	    typebuf_was_filled = TRUE;
+	    if (vgetc_busy)
+		typebuf_was_filled = TRUE;
 	}
     }
 }
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 1037ac2139..8beefe7611 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3121,6 +3121,7 @@ set_toolbar_style(GtkToolbar *toolbar)
 #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
 static int ignore_tabline_evt = FALSE;
 static GtkWidget *tabline_menu;
+static GtkTooltips *tabline_tooltip;
 static int clicked_page;	    /* page clicked in tab line */
 
 /*
@@ -3130,7 +3131,6 @@ static int clicked_page;	    /* page clicked in tab line */
     static void
 tabline_menu_handler(GtkMenuItem *item, gpointer user_data)
 {
-
     /* Add the string cmd into input buffer */
     send_tabline_menu_event(clicked_page, (int)(long)user_data);