updated for version 7.3.477

Problem:    Using ":echo" to output enough lines to scroll, then using "j" and
            "k" at the more prompt, displays the command on top of the output.
            (Marcin Szamotulski)
Solution:   Put the output below the command. (Christian Brabandt)

runtime/doc/autocmd.txt

@@ -700,7 +700,9 @@ QuickFixCmdPre			Before a quickfix command is run (|:make|,
 				|:lmake|, |:grep|, |:lgrep|, |:grepadd|,
 				|:lgrepadd|, |:vimgrep|, |:lvimgrep|,
 				|:vimgrepadd|, |:lvimgrepadd|, |:cscope|,
-				|:helpgrep|, |:lhelpgrep|).
+				|:cfile|, |:cgetfile|, |:caddfile|, |:lfile|,
+				|:lgetfile|, |:laddfile|, |:helpgrep|,
+				|:lhelpgrep|).
 				The pattern is matched against the command
 				being run.  When |:grep| is used but 'grepprg'
 				is set to "internal" it still matches "grep".
@@ -711,7 +713,10 @@ QuickFixCmdPre			Before a quickfix command is run (|:make|,
 							*QuickFixCmdPost*
 QuickFixCmdPost			Like QuickFixCmdPre, but after a quickfix
 				command is run, before jumping to the first
-				location.  See |QuickFixCmdPost-example|.
+				location. For |:cfile| and |:lfile| commands
+				it is run after error file is read and before
+				moving to the first error. 
+				See |QuickFixCmdPost-example|.
 							*RemoteReply*
 RemoteReply			When a reply from a Vim that functions as
 				server was received |server2client()|.  The

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.3.  Last change: 2012 Jan 28
+*eval.txt*	For Vim version 7.3.  Last change: 2012 Mar 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1746,7 +1746,8 @@ exists( {expr})			Number	TRUE if {expr} exists
 extend( {expr1}, {expr2} [, {expr3}])
 				List/Dict insert items of {expr2} into {expr1}
 exp( {expr})			Float	exponential of {expr}
-expand( {expr} [, {flag}])	String	expand special keywords in {expr}
+expand( {expr} [, {nosuf} [, {list}]])
+				any	expand special keywords in {expr}
 feedkeys( {string} [, {mode}])	Number	add key sequence to typeahead buffer
 filereadable( {file})		Number	TRUE if {file} is a readable file
 filewritable( {file})		Number	TRUE if {file} is a writable file
@@ -1800,7 +1801,8 @@ gettabwinvar( {tabnr}, {winnr}, {name})
 getwinposx()			Number	X coord in pixels of GUI Vim window
 getwinposy()			Number	Y coord in pixels of GUI Vim window
 getwinvar( {nr}, {varname})	any	variable {varname} in window {nr}
-glob( {expr} [, {flag}])	String	expand file wildcards in {expr}
+glob( {expr} [, {nosuf} [, {list}]])
+				any	expand file wildcards in {expr}
 globpath( {path}, {expr} [, {flag}])
 				String	do glob({expr}) for all dirs in {path}
 has( {feature})			Number	TRUE if feature {feature} supported
@@ -2742,13 +2744,15 @@ exp({expr})						*exp()*
 		{only available when compiled with the |+float| feature}
 
 
-expand({expr} [, {flag}])				*expand()*
+expand({expr} [, {nosuf} [, {list}]])				*expand()*
 		Expand wildcards and the following special keywords in {expr}.
-		The result is a String.  'wildignorecase' applies.
+		'wildignorecase' applies.
 
-		When there are several matches, they are separated by <NL>
-		characters.  [Note: in version 5.0 a space was used, which
-		caused problems when a file name contains a space]
+		If {list} is given and it is non-zero, a List will be returned.
+		Otherwise the result is a String and when there are several
+		matches, they are separated by <NL> characters.  [Note: in
+		version 5.0 a space was used, which caused problems when a
+		file name contains a space]
 
 		If the expansion fails, the result is an empty string.	A name
 		for a non-existing file is not included.
@@ -2802,10 +2806,10 @@ expand({expr} [, {flag}])				*expand()*
 		When {expr} does not start with '%', '#' or '<', it is
 		expanded like a file name is expanded on the command line.
 		'suffixes' and 'wildignore' are used, unless the optional
-		{flag} argument is given and it is non-zero.  Names for
-		non-existing files are included.  The "**" item can be used to
-		search in a directory tree.  For example, to find all "README"
-		files in the current directory and below: >
+		{nosuf} argument is given and it is non-zero.
+		Names for non-existing files are included.  The "**" item can
+		be used to search in a directory tree.  For example, to find
+		all "README" files in the current directory and below: >
 			:echo expand("**/README")
 <
 		Expand() can also be used to expand variables and environment
@@ -3452,18 +3456,23 @@ getwinvar({winnr}, {varname})				*getwinvar()*
 			:let list_is_on = getwinvar(2, '&list')
 			:echo "myvar = " . getwinvar(1, 'myvar')
 <
-glob({expr} [, {flag}])					*glob()*
+glob({expr} [, {nosuf} [, {list}]])				*glob()*
 		Expand the file wildcards in {expr}.  See |wildcards| for the
 		use of special characters.
-		The result is a String.
-		When there are several matches, they are separated by <NL>
-		characters.
-		Unless the optional {flag} argument is given and is non-zero,
+
+		Unless the optional {nosuf} argument is given and is non-zero,
 		the 'suffixes' and 'wildignore' options apply: Names matching
 		one of the patterns in 'wildignore' will be skipped and
 		'suffixes' affect the ordering of matches.
 		'wildignorecase' always applies.
-		If the expansion fails, the result is an empty string.
+
+		When {list} is present and it is non-zero the result is a List
+		with all matching files. The advantage of using a List is,
+		you also get filenames containing newlines correctly.
+		Otherwise the result is a String and when there are several
+		matches, they are separated by <NL> characters.
+
+		If the expansion fails, the result is an empty String or List.
 		A name for a non-existing file is not included.
 
 		For most systems backticks can be used to get files names from
@@ -6676,9 +6685,9 @@ Hint: If you distribute a bunch of scripts you can pack them together with the
 ==============================================================================
 6. Curly braces names					*curly-braces-names*
 
-Wherever you can use a variable, you can use a "curly braces name" variable.
-This is a regular variable name with one or more expressions wrapped in braces
-{} like this: >
+In most places where you can use a variable, you can use a "curly braces name"
+variable.  This is a regular variable name with one or more expressions
+wrapped in braces {} like this: >
 	my_{adjective}_variable
 
 When Vim encounters this, it evaluates the expression inside the braces, puts
@@ -6714,6 +6723,11 @@ Example: >
 
 This would call the function "my_func_whizz(parameter)".
 
+This does NOT work: >
+  :let i = 3
+  :let @{i} = ''  " error
+  :echo @{i}      " error
+
 ==============================================================================
 7. Commands						*expression-commands*
 

runtime/doc/mbyte.txt

@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.3.  Last change: 2011 Oct 15
+*mbyte.txt*     For Vim version 7.3.  Last change: 2012 Feb 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -857,7 +857,7 @@ Use the RPM or port for your system.
 
 
 USING XIM			*multibyte-input* *E284* *E286* *E287* *E288*
-				*E285* *E291* *E292* *E290* *E289*
+				*E285* *E289*
 
 Note that Display and Input are independent.  It is possible to see your
 language even though you have no input method for it.  But when your Display

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2012 Feb 22
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Mar 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -44,9 +44,6 @@ Stack trace of crash: http://vpaste.net/GBt9S
 Once syntax and other runtime files have been fixed: add "set cp" to
 check.vim.  Use a function to run both with 'cp' and 'nocp'.
 
-Undo broken when pasting close to the last line. (Andrey Radev, 2012 Feb 14)
-Patch by Christian Brabandt, 2012 Feb 14.
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
@@ -54,24 +51,14 @@ Win32: When a directory name contains an exclamation mark, completion doesn't
 complete the contents of the directory.  No escaping for the "!"? (Jan
 Stocker, 2012 Jan 5)
 
-Patch to speed up ga_grow(). (Dominique Pelle, 2012 Feb 13)
+Issue 54: document behavior of -complete, also expands arg.
 
-Patch for "tab drop hoge" moving current window. (Higashi, 2012 Jan 31)
-":tab drop buffer.c" always opens a new tab, also if buffer.c is already in an
-open window. (Herb Sitz, 2011 Nov 17)
-":tab drop filename" doesn't work nicely when "filename" is open in a window
-in another tab. (Tony Mechelynck, 2009 Feb 13)
-
-Patch to make InsertCharPre work better. (Yasuhiro Matsumoto, 2011 Oct 21)
-
-Patch to fix closed folds with "loadview". (Xavier de Gaye, 2011 Nov 25)
+Syntax update problem in one buffer opened in two windows, bottom window is
+not correctly updated. (Paul Harris, 2012 Feb 27)
 
 Patch to add getsid(). (Tyru, 2011 Oct 2)  Do we want this?  Update Oct 4.
 Or use expand('<sid>')?
 
-Patch for glob() returning a list. (Christian Brabandt, 2011 Aug 24, second
-one)
-
 Win32: When the taskbar is at the top of the screen creating the tabbar causes
 the window to move unnecessarily. (William E. Skeith III, 2012 Jan 12)
 Patch: 2012 Jan 13  Needs more work (2012 Feb 2)
@@ -84,12 +71,6 @@ URXVT:
 - Use urxvt mouse support also in xterm.  Explanations:
   http://www.midnight-commander.org/ticket/2662
 
-Patch for using QuickFixCmdPre for more commands. (Marcin Szamotulski, 2012
-Feb 1, update Feb 2)
-
-Patch for pasting in the Ex command line is slow. (Dominique Pelle, 2012 Feb
-19)
-
 When running Vim in silent ex mode, an existing swapfile causes Vim to wait
 for a user action without a prompt. (Maarten Billemont, 2012 Feb 3)
 Do give the prompt? Quit with an error?
@@ -107,6 +88,9 @@ Recognize objcpp. (Austin Ziegler, 2012 Feb 15)
     side effect.
 Patch by Kana Natsuno, 2011 Nov 12.
 
+Using Ctrl-] in a mapping does not expand abbreviations. Patch by Christian
+Brabandt, 2012 Mar 2.
+
 Patch to fix member confusion in Lua interface. (Taro Muraoka, 2012 Jan 8)
 Update Jan 9.
 Carvalho merged the patch:  New version 2012 Jan 19.
@@ -137,6 +121,8 @@ Name it "CompleteFuncDone".
 Patch for Make_mvc.mak and Make_ming.mak for Ruby support. (Yasuhiro
 Matsumoto, 2012 Jan 30)
 
+Patch to add completion for :history command.  (Dominique Pelle, 2012 Feb 26)
+
 Use a count before "v" and "V" to select that many characters or lines?
 (Kikyous)
 
@@ -197,6 +183,9 @@ Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
 only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
 21, Ben Fritz, 2010 Sep 14)
 
+Win32: Does building a 64 bit version with VC9 give warnings for int
+conversions? (Mike Williams)
+
 Win32: Patch to use task dialogs when available. (Sergiu Dotenco, 2011 Sep 17)
 New feature, requires testing.  Made some remarks.
 
@@ -251,6 +240,10 @@ Bug: Windows 7 64 bit system freezes  when 'clipboard' set to "unnamed" and
 doing ":g/test/d".  Putting every delete on the clipboard? (Robert Chan, 2011
 Jun 17)
 
+When there is a ">" in a line that "gq" wraps to the start of the next line,
+then the following line will pick it up as a leader.  Should get the leader
+from the first line, not a wrapped line. (Matt Ackeret, 2012 Feb 27)
+
 Using ":break" or something else that stops executing commands inside a
 ":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct
 15)

runtime/doc/undo.txt

@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.3.  Last change: 2012 Jan 28
+*undo.txt*      For Vim version 7.3.  Last change: 2012 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -250,7 +250,7 @@ detect if an undo file is no longer synchronized with the file it was written
 for (with a hash of the file contents) and ignore it when the file was changed
 after the undo file was written, to prevent corruption.  An undo file is also
 ignored if its owner differs from the owner of the edited file.  Set 'verbose'
-to get a message about that.
+to get a message about that when opening a file.
 
 Undo files are normally saved in the same directory as the file.  This can be
 changed with the 'undodir' option.

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Feb 05
+" Last Change:	2012 Feb 24
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -2317,6 +2317,9 @@ au BufNewFile,BufRead fglrxrc			setf xml
 au BufNewFile,BufRead *.xlf			setf xml
 au BufNewFile,BufRead *.xliff			setf xml
 
+" XML User Interface Language
+au BufNewFile,BufRead *.xul			setf xml
+
 " X11 xmodmap (also see below)
 au BufNewFile,BufRead *Xmodmap			setf xmodmap
 

runtime/ftplugin/abaqus.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:     Abaqus finite element input file (www.abaqus.com)
 " Maintainer:   Carl Osterwisch <osterwischc@asme.org>
-" Last Change:  2008 Oct 5
+" Last Change:  2012 Mar 11
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin") | finish | endif
@@ -87,3 +87,4 @@ let b:undo_ftplugin .= "|unmap <buffer> [[|unmap <buffer> ]]"
 
 " Restore saved compatibility options
 let &cpoptions = s:cpo_save
+unlet s:cpo_save

runtime/ftplugin/ant.vim

@@ -41,3 +41,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/aspvbs.vim

@@ -57,3 +57,4 @@ let b:undo_ftplugin = "unlet! b:match_words b:match_ignorecase b:browsefilter |
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/config.vim

@@ -39,3 +39,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . b:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/csc.vim

@@ -24,3 +24,4 @@ let b:undo_ftplugin = "unlet! b:match_words"
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/csh.vim

@@ -45,3 +45,4 @@ let b:undo_ftplugin = "setlocal commentstring< formatoptions<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/dtd.vim

@@ -37,3 +37,4 @@ let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/erlang.vim

@@ -19,6 +19,9 @@ else
 	let s:did_function_definitions = 1
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 if !exists('g:erlang_keywordprg')
 	let g:erlang_keywordprg = 'erl -man'
 endif
@@ -76,3 +79,9 @@ function ErlangFoldText()
 endfunction
 
 call s:SetErlangOptions()
+
+let b:undo_ftplugin = "setlocal foldmethod< foldexpr< foldtext<"
+	\ . " comments< commentstring< formatoptions<"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/ftplugin/eruby.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:		2010 Apr 15
+" Last Change:		2012 Mar 11
 " URL:			http://vim-ruby.rubyforge.org
 " Anon CVS:		See above site
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
@@ -100,5 +100,6 @@ let b:undo_ftplugin = "setl cms< "
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
+unlet s:save_cpo
 
 " vim: nowrap sw=2 sts=2 ts=8:

runtime/ftplugin/haml.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:		Haml
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:		2010 May 21
+" Last Change:		2012 Mar 11
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -63,5 +63,6 @@ let b:undo_ftplugin = "setl cms< com< "
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
+unlet s:save_cpo
 
 " vim:set sw=2:

runtime/ftplugin/hamster.vim

@@ -12,7 +12,7 @@ endif
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-let cpo_save = &cpo
+let s:cpo_save = &cpo
 set cpo-=C
 
 let b:undo_ftplugin = "setl fo< com< tw< commentstring<"
@@ -57,5 +57,6 @@ if exists("loaded_matchit")
 endif
 
 setlocal ignorecase
-let &cpo = cpo_save
+let &cpo = s:cpo_save
+unlet s:cpo_save
 setlocal cpo+=M		" makes \%( match \)

runtime/ftplugin/html.vim

@@ -88,3 +88,4 @@ let b:undo_ftplugin = "setlocal commentstring< matchpairs< omnifunc< comments< f
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/initex.vim

@@ -34,5 +34,6 @@ let &l:include = '\\input'
 setlocal suffixesadd=.tex
 
 let &cpo = s:save_cpo
+unlet s:save_cpo
 
 " vim:sts=2:sw=2:

runtime/ftplugin/java.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Java
 " Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Change:  20 Jan 2009
+" Last Change:  2012 Mar 11
 " URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
 
 if exists("b:did_ftplugin") | finish | endif
@@ -48,3 +48,4 @@ let b:undo_ftplugin = "setlocal suffixes< suffixesadd<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/jsp.vim

@@ -64,3 +64,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/lisp.vim

@@ -4,7 +4,7 @@
 " URL:		 http://sites.google.com/site/khorser/opensource/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change:   Jan 9, 2012
+" Last Change:   Mar 5, 2012
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -24,3 +24,5 @@ setl lisp
 " e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment
 setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
 setl formatoptions+=croql
+
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp<"

runtime/ftplugin/lua.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file.
 " Language:	Lua 4.0+
 " Maintainer:	Max Ischenko <mfi@ukr.net>
-" Last Change:	2011 Dec 10 by Thilo Six
+" Last Change:	2012 Mar 07
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -38,3 +38,5 @@ endif " exists("loaded_matchit")
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+let b:undo_ftplugin = "setlocal fo< com< cms< suffixesadd<"

runtime/ftplugin/man.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	man
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Last Change:	2011 Jul 25
+" Last Change:	2012 Mar 6
 
 " To make the ":Man" command available before editing a manual page, source
 " this script from your startup vimrc file.
@@ -35,6 +35,8 @@ if &filetype == "man"
     nnoremap <buffer> <c-t> :call <SID>PopPage()<CR>
   endif
 
+  let b:undo_ftplugin = "setlocal iskeyword<"
+
 endif
 
 if exists(":Man") != 2

runtime/ftplugin/matlab.vim

@@ -25,6 +25,4 @@ let b:undo_ftplugin = "setlocal suffixesadd< suffixes< "
 	\ . "| unlet! b:match_words"
 
 let &cpo = s:save_cpo
-
-
-
+unlet s:save_cpo

runtime/ftplugin/occam.vim

@@ -37,3 +37,8 @@ if has("gui_win32") && !exists("b:browsefilter")
 endif
 "}}}
 
+"{{{  Undo settings
+let b:undo_ftplugin = "setlocal shiftwidth< softtabstop< expandtab<"
+	\ . " formatoptions< comments< textwidth<"
+	\ . "| unlet! b:browsefiler"
+"}}}

runtime/ftplugin/perl.vim

@@ -2,7 +2,7 @@
 " Language:     Perl
 " Maintainer:   Andy Lester <andy@petdance.com>
 " URL:          http://github.com/petdance/vim-perl
-" Last Change:  2009-08-14
+" Last Change:  2012 Mar 11
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
@@ -69,3 +69,4 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/perl6.vim

@@ -2,7 +2,7 @@
 " Language:     Perl 6
 " Maintainer:   Andy Lester <andy@petdance.com>
 " URL:          http://github.com/petdance/vim-perl/tree/master
-" Last Change:  2010-08-10
+" Last Change:  2012 Mar 11
 " Contributors: Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
 "
 " Based on ftplugin/perl.vim by Dan Sharp <dwsharp at hotmail dot com>
@@ -46,3 +46,4 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isk<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/php.vim

@@ -80,3 +80,4 @@ let b:undo_ftplugin = "setlocal commentstring< include< omnifunc<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/plaintex.vim

@@ -32,5 +32,6 @@ if exists("loaded_matchit")
 endif " exists("loaded_matchit")
 
 let &cpo = s:save_cpo
+unlet s:save_cpo
 
 " vim:sts=2:sw=2:

runtime/ftplugin/rpl.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:     RPL/2
 " Maintainer:   Jo<4A>l BERTRAND <rpl2@free.fr>
-" Last Change:	2005 Mar 28
+" Last Change:	2012 Mar 07
 " Version: 		0.1
 
 " Only do this when not done yet for this buffer
@@ -18,3 +18,5 @@ setlocal fo-=t fo+=croql
 
 " Set 'comments' to format dashed lists in comments.
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+let b:undo_ftplugin = "setlocal fo< comments<"

runtime/ftplugin/scheme.vim

@@ -4,7 +4,7 @@
 " URL:		 http://sites.google.com/site/khorser/opensource/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change:   Jan 9, 2012
+" Last Change:   Mar 5, 2012
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -43,3 +43,5 @@ if exists("b:is_chicken") || exists("is_chicken")
     setl lispwords+=define-values,opt-lambda,case-lambda,syntax-rules,with-syntax,syntax-case
     setl lispwords+=cond-expand,and-let*,foreign-lambda,foreign-lambda*
 endif
+
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lispwords< lisp<"

runtime/ftplugin/sgml.vim

@@ -37,3 +37,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/sh.vim

@@ -36,3 +36,4 @@ let b:undo_ftplugin = "setlocal cms< | unlet! b:browsefilter b:match_words"
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/spec.vim

@@ -1,7 +1,7 @@
 " Plugin to update the %changelog section of RPM spec files
 " Filename: spec.vim
 " Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com>
-" Last Change: 2011 Dec 25 by Thilo Six
+" Last Change: 2012 Mar 07
 
 if exists("b:did_ftplugin")
 	finish
@@ -172,3 +172,4 @@ let b:match_words =
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
+let b:undo_ftplugin = "unlet! b:match_ignorecase b:match_words"

runtime/ftplugin/sql.vim

@@ -2,7 +2,7 @@
 " Language:    SQL (Common for Oracle, Microsoft SQL Server, Sybase)
 " Version:     8.0
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Last Change: 2011 Apr 01
+" Last Change: 2012 Mar 11
 " Download:    http://vim.sourceforge.net/script.php?script_id=454
 
 " For more details please use:
@@ -490,6 +490,7 @@ if exists('&omnifunc')
 endif
 
 let &cpo = s:save_cpo
+unlet s:save_cpo
 
 " vim:sw=4:
 

runtime/ftplugin/svg.vim

@@ -37,3 +37,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/tcl.vim

@@ -32,5 +32,6 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:cpo_save
+unlet s:cpo_save
 
 " vim: set et ts=4 sw=4 tw=78:

runtime/ftplugin/tcsh.vim

@@ -37,3 +37,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/tex.vim

@@ -41,5 +41,6 @@ if exists("loaded_matchit")
 endif " exists("loaded_matchit")
 
 let &cpo = s:save_cpo
+unlet s:save_cpo
 
 " vim:sts=2:sw=2:

runtime/ftplugin/xhtml.vim

@@ -64,3 +64,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/xml.vim

@@ -61,3 +61,4 @@ let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<" .
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/ftplugin/xsd.vim

@@ -36,3 +36,4 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
 
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/syntax/dnsmasq.vim

@@ -1,14 +1,19 @@
-" Vim syntax file
-" Language:	dnsmasq configuration file
+" Vim file
 " Maintainer:	Thilo Six <T.Six@gmx.de>
-" Version:	2.59-1
-" Last Change:	2011 Dec 11
+" Version:	2.60-1
+" Last Change:	2012 Mar 10
 " Modeline:	vim: ts=8:sw=2:sts=2:
+" File:		runtime/syntax/dnsmasq.vim
 "
 " Credits:	Igor N. Prischepoff
 "		Doug Kearns
 "		David Ne\v{c}as
 "
+" License:	VIM License
+"		see ":help copyright"
+"
+" Description:	highlight dnsmasq configuration files
+"
 " Options:	You might want to add this to your vimrc:
 "
 "		if &background == "dark"
@@ -18,7 +23,6 @@
 "		    let dnsmasq_backrgound_light = 1
 "		endif
 "
-"
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -28,11 +32,9 @@ elseif exists("b:current_syntax") || &compatible
     finish
 endif
 
-" predictable environment:
-let s:keepcpo = &cpo
+let s:cpo_save = &cpo
 set cpo&vim
 
-
 if !exists("b:dnsmasq_backrgound_light")
 	if exists("dnsmasq_backrgound_light")
 		let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light
@@ -106,6 +108,7 @@ syn match DnsmasqKeyword    "^\s*dhcp-authoritative\>"
 syn match DnsmasqKeyword    "^\s*dhcp-boot\>"
 syn match DnsmasqKeyword    "^\s*dhcp-broadcast\>"
 syn match DnsmasqKeyword    "^\s*dhcp-circuitid\>"
+syn match DnsmasqKeyword    "^\s*dhcp-client-update\>"
 syn match DnsmasqKeyword    "^\s*dhcp-fqdn\>"
 syn match DnsmasqKeyword    "^\s*dhcp-generate-names\>"
 syn match DnsmasqKeyword    "^\s*dhcp-host\>"
@@ -114,6 +117,7 @@ syn match DnsmasqKeyword    "^\s*dhcp-ignore\>"
 syn match DnsmasqKeyword    "^\s*dhcp-ignore-names\>"
 syn match DnsmasqKeyword    "^\s*dhcp-lease-max\>"
 syn match DnsmasqKeyword    "^\s*dhcp-leasefile\>"
+syn match DnsmasqKeyword    "^\s*dhcp-luascript\>"
 syn match DnsmasqKeyword    "^\s*dhcp-mac\>"
 syn match DnsmasqKeyword    "^\s*dhcp-match\>"
 syn match DnsmasqKeyword    "^\s*dhcp-no-override\>"
@@ -134,6 +138,7 @@ syn match DnsmasqKeyword    "^\s*domain\>"
 syn match DnsmasqKeyword    "^\s*domain-needed\>"
 syn match DnsmasqKeyword    "^\s*edns-packet-max\>"
 syn match DnsmasqKeyword    "^\s*enable-dbus\>"
+syn match DnsmasqKeyword    "^\s*enable-ra\>"
 syn match DnsmasqKeyword    "^\s*enable-tftp\>"
 syn match DnsmasqKeyword    "^\s*except-interface\>"
 syn match DnsmasqKeyword    "^\s*expand-hosts\>"
@@ -145,9 +150,9 @@ syn match DnsmasqKeyword    "^\s*keep-in-foreground\>"
 syn match DnsmasqKeyword    "^\s*leasefile-ro\>"
 syn match DnsmasqKeyword    "^\s*listen-address\>"
 syn match DnsmasqKeyword    "^\s*local\>"
+syn match DnsmasqKeyword    "^\s*localmx\>"
 syn match DnsmasqKeyword    "^\s*local-ttl\>"
 syn match DnsmasqKeyword    "^\s*localise-queries\>"
-syn match DnsmasqKeyword    "^\s*localmx\>"
 syn match DnsmasqKeyword    "^\s*log-async\>"
 syn match DnsmasqKeyword    "^\s*log-dhcp\>"
 syn match DnsmasqKeyword    "^\s*log-facility\>"
@@ -217,6 +222,6 @@ hi def link DnsmasqValues	Normal
 
 let b:current_syntax = "dnsmasq"
 
-let &cpo = s:keepcpo
-unlet s:keepcpo
+let &cpo = s:cpo_save
+unlet s:cpo_save
 

runtime/syntax/lout.vim

@@ -1,13 +1,21 @@
 " Vim syntax file
 " Language:    Lout
 " Maintainer:  Christian V. J. Br<42>ssow <cvjb@cvjb.de>
-" Last Change: Son 22 Jun 2003 20:43:26 CEST
+" Last Change: So 12 Feb 2012 15:15:03 CET
 " Filenames:   *.lout,*.lt
-" URL:			http://www.cvjb.de/comp/vim/lout.vim
-" $Id: lout.vim,v 1.1 2004/06/13 17:52:18 vimboss Exp $
+" URL:         http://www.cvjb.de/comp/vim/lout.vim
+
+" $Id: lout.vim,v 1.4 2012/02/12 15:16:17 bruessow Exp $
 "
 " Lout: Basser Lout document formatting system.
 
+" Many Thanks to...
+" 
+" 2012-02-12:
+" Thilo Six <T.Six at gmx dot de> send a patch for cpoptions.
+" See the discussion at http://thread.gmane.org/gmane.editors.vim.devel/32151
+
+
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
@@ -16,6 +24,9 @@ elseif exists("b:current_syntax")
 	finish
 endif
 
+let s:cpo_save=&cpo
+set cpo&vim
+
 " Lout is case sensitive
 syn case match
 
@@ -136,4 +147,7 @@ endif
 
 let b:current_syntax = "lout"
 
+let &cpo=s:cpo_save
+unlet s:cpo_save
+
 " vim:ts=8:sw=4:nocindent:smartindent:

runtime/syntax/sshconfig.vim

@@ -2,7 +2,7 @@
 " Language:	OpenSSH client configuration file (ssh_config)
 " Author:	David Necas (Yeti)
 " Maintainer:   Leonard Ehrenfried <leonard.ehrenfried@web.de>	
-" Last Change:	2012 Feb 19
+" Last Change:	2012 Feb 24 
 " SSH Version:	5.9p1
 "
 

src/INSTALLpc.txt

@@ -239,6 +239,12 @@ If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX'
 found at
     http://www.upx.org/
 
+As of 2011, UPX still does not support compressing 64-bit EXE's; if you have
+built a 64-bit vim then an alternative to UPX is 'MPRESS'. MPRESS can be found
+at:
+    http://www.matcode.com/mpress.htm
+
+
 ADDITION: NLS support with MinGW
 
 (by Eduardo F. Amatria <eferna1@platea.pntic.mec.es>)

src/Make_ming.mak

@@ -14,9 +14,11 @@
 # it's just run out of memory or something.  Run again, and it will continue
 # with 'xxd'.
 #
-# "make upx" makes *compressed* versions of the GUI and console EXEs, using the
-# excellent UPX compressor:
+# "make upx" makes *compressed* versions of the 32 bit GUI and console EXEs,
+# using the excellent UPX compressor:
 #     http://upx.sourceforge.net/
+# "make mpress" uses the MPRESS compressor for 32- and 64-bit EXEs:
+#     http://www.matcode.com/mpress.htm
 #
 # Maintained by Ron Aaron <ronaharon@yahoo.com>
 # updated 2003 Jan 20
@@ -640,6 +642,10 @@ upx: exes
 	upx gvim.exe
 	upx vim.exe
 
+mpress: exes
+	mpress gvim.exe
+	mpress vim.exe
+
 xxd/xxd.exe: xxd/xxd.c
 	$(MAKE) -C xxd -f Make_ming.mak CC=$(CC)
 

src/buffer.c

@@ -329,7 +329,7 @@ close_buffer(win, buf, action, abort_if_last)
     win_T	*win;		/* if not NULL, set b_last_cursor */
     buf_T	*buf;
     int		action;
-    int		abort_if_last;
+    int		abort_if_last UNUSED;
 {
 #ifdef FEAT_AUTOCMD
     int		is_curbuf;
@@ -5557,7 +5557,7 @@ sign_list_placed(rbuf)
 	buf = firstbuf;
     else
 	buf = rbuf;
-    while (buf != NULL)
+    while (buf != NULL && !got_int)
     {
 	if (buf->b_signlist != NULL)
 	{
@@ -5565,7 +5565,7 @@ sign_list_placed(rbuf)
 	    MSG_PUTS_ATTR(lbuf, hl_attr(HLF_D));
 	    msg_putchar('\n');
 	}
-	for (p = buf->b_signlist; p != NULL; p = p->next)
+	for (p = buf->b_signlist; p != NULL && !got_int; p = p->next)
 	{
 	    vim_snprintf(lbuf, BUFSIZ, _("    line=%ld  id=%d  name=%s"),
 			   (long)p->lnum, p->id, sign_typenr2name(p->typenr));

src/edit.c

@@ -259,6 +259,9 @@ static int  ins_ctrl_ey __ARGS((int tc));
 static void ins_try_si __ARGS((int c));
 #endif
 static colnr_T get_nolist_virtcol __ARGS((void));
+#ifdef FEAT_AUTOCMD
+static char_u *do_insert_char_pre __ARGS((int c));
+#endif
 
 static colnr_T	Insstart_textlen;	/* length of line when insert started */
 static colnr_T	Insstart_blank_vcol;	/* vcol for first inserted blank */
@@ -784,7 +787,20 @@ edit(cmdchar, startln, count)
 		 * completion: Add to "compl_leader". */
 		if (ins_compl_accept_char(c))
 		{
-		    ins_compl_addleader(c);
+#ifdef FEAT_AUTOCMD
+		    /* Trigger InsertCharPre. */
+		    char_u *str = do_insert_char_pre(c);
+		    char_u *p;
+
+		    if (str != NULL)
+		    {
+			for (p = str; *p != NUL; mb_ptr_adv(p))
+			    ins_compl_addleader(PTR2CHAR(p));
+			vim_free(str);
+		    }
+		    else
+#endif
+			ins_compl_addleader(c);
 		    continue;
 		}
 
@@ -1393,34 +1409,31 @@ normalchar:
 #ifdef FEAT_AUTOCMD
 	    if (!p_paste)
 	    {
-		/* Trigger the InsertCharPre event.  Lock the text to avoid
-		 * weird things from happening. */
-		set_vim_var_char(c);
-		++textlock;
-		if (apply_autocmds(EVENT_INSERTCHARPRE, NULL, NULL,
-							       FALSE, curbuf))
+		/* Trigger InsertCharPre. */
+		char_u *str = do_insert_char_pre(c);
+		char_u *p;
+
+		if (str != NULL)
 		{
-		    /* Get the new value of v:char.  If it is more than one
-		     * character insert it literally. */
-		    char_u *s = get_vim_var_str(VV_CHAR);
-		    if (MB_CHARLEN(s) > 1)
+		    if (*str != NUL && stop_arrow() != FAIL)
 		    {
-			if (stop_arrow() != FAIL)
+			/* Insert the new value of v:char literally. */
+			for (p = str; *p != NUL; mb_ptr_adv(p))
 			{
-			    ins_str(s);
-			    AppendToRedobuffLit(s, -1);
+			    c = PTR2CHAR(p);
+			    if (c == CAR || c == K_KENTER || c == NL)
+				ins_eol(c);
+			    else
+				ins_char(c);
 			}
-			c = NUL;
+			AppendToRedobuffLit(str, -1);
 		    }
-		    else
-			c = PTR2CHAR(s);
+		    vim_free(str);
+		    c = NUL;
 		}
 
-		set_vim_var_string(VV_CHAR, NULL, -1);
-		--textlock;
-
-		/* If the new value is an empty string then don't insert a
-		 * char. */
+		/* If the new value is already inserted or an empty string
+		 * then don't insert any character. */
 		if (c == NUL)
 		    break;
 	    }
@@ -5883,6 +5896,8 @@ insertchar(c, flags, second_indent)
      * Don't do this when 'cindent' or 'indentexpr' is set, because we might
      * need to re-indent at a ':', or any other character (but not what
      * 'paste' is set)..
+     * Don't do this when there an InsertCharPre autocommand is defined,
+     * because we need to fire the event for every character.
      */
 #ifdef USE_ON_FLY_SCROLL
     dont_scroll = FALSE;		/* allow scrolling here */
@@ -5899,6 +5914,9 @@ insertchar(c, flags, second_indent)
 #endif
 #ifdef FEAT_RIGHTLEFT
 	    && !p_ri
+#endif
+#ifdef FEAT_AUTOCMD
+	    && !has_insertcharpre()
 #endif
 	       )
     {
@@ -10068,3 +10086,38 @@ get_nolist_virtcol()
     validate_virtcol();
     return curwin->w_virtcol;
 }
+
+#ifdef FEAT_AUTOCMD
+/*
+ * Handle the InsertCharPre autocommand.
+ * "c" is the character that was typed.
+ * Return a pointer to allocated memory with the replacement string.
+ * Return NULL to continue inserting "c".
+ */
+    static char_u *
+do_insert_char_pre(c)
+    int c;
+{
+    char_u *res;
+
+    /* Return quickly when there is nothing to do. */
+    if (!has_insertcharpre())
+	return NULL;
+
+    /* Lock the text to avoid weird things from happening. */
+    ++textlock;
+    set_vim_var_char(c);  /* set v:char */
+
+    if (apply_autocmds(EVENT_INSERTCHARPRE, NULL, NULL, FALSE, curbuf))
+	/* Get the new value of v:char.  It may be empty or more than one
+	 * character. */
+	res = vim_strsave(get_vim_var_str(VV_CHAR));
+    else
+	res = NULL;
+
+    set_vim_var_string(VV_CHAR, NULL, -1);  /* clear v:char */
+    --textlock;
+
+    return res;
+}
+#endif

src/eval.c

@@ -7852,7 +7852,7 @@ static struct fst
 #ifdef FEAT_FLOAT
     {"exp",		1, 1, f_exp},
 #endif
-    {"expand",		1, 2, f_expand},
+    {"expand",		1, 3, f_expand},
     {"extend",		2, 3, f_extend},
     {"feedkeys",	1, 2, f_feedkeys},
     {"file_readable",	1, 1, f_filereadable},	/* obsolete */
@@ -7903,7 +7903,7 @@ static struct fst
     {"getwinposx",	0, 0, f_getwinposx},
     {"getwinposy",	0, 0, f_getwinposy},
     {"getwinvar",	2, 2, f_getwinvar},
-    {"glob",		1, 2, f_glob},
+    {"glob",		1, 3, f_glob},
     {"globpath",	2, 3, f_globpath},
     {"has",		1, 1, f_has},
     {"has_key",		2, 2, f_has_key},
@@ -10019,14 +10019,33 @@ f_expand(argvars, rettv)
     int		options = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
     expand_T	xpc;
     int		error = FALSE;
+    char_u	*result;
 
     rettv->v_type = VAR_STRING;
+    if (argvars[1].v_type != VAR_UNKNOWN
+	    && argvars[2].v_type != VAR_UNKNOWN
+	    && get_tv_number_chk(&argvars[2], &error)
+	    && !error)
+    {
+	rettv->v_type = VAR_LIST;
+	rettv->vval.v_list = NULL;
+    }
+
     s = get_tv_string(&argvars[0]);
     if (*s == '%' || *s == '#' || *s == '<')
     {
 	++emsg_off;
-	rettv->vval.v_string = eval_vars(s, s, &len, NULL, &errormsg, NULL);
+	result = eval_vars(s, s, &len, NULL, &errormsg, NULL);
 	--emsg_off;
+	if (rettv->v_type == VAR_LIST)
+	{
+	    if (rettv_list_alloc(rettv) != FAIL && result != NULL)
+		list_append_string(rettv->vval.v_list, result, -1);
+	    else
+		vim_free(result);
+	}
+	else
+	    rettv->vval.v_string = result;
     }
     else
     {
@@ -10041,7 +10060,18 @@ f_expand(argvars, rettv)
 	    xpc.xp_context = EXPAND_FILES;
 	    if (p_wic)
 		options += WILD_ICASE;
-	    rettv->vval.v_string = ExpandOne(&xpc, s, NULL, options, WILD_ALL);
+	    if (rettv->v_type == VAR_STRING)
+		rettv->vval.v_string = ExpandOne(&xpc, s, NULL,
+							   options, WILD_ALL);
+	    else if (rettv_list_alloc(rettv) != FAIL)
+	    {
+		int i;
+
+		ExpandOne(&xpc, s, NULL, options, WILD_ALL_KEEP);
+		for (i = 0; i < xpc.xp_numfiles; i++)
+		    list_append_string(rettv->vval.v_list, xpc.xp_files[i], -1);
+		ExpandCleanup(&xpc);
+	    }
 	}
 	else
 	    rettv->vval.v_string = NULL;
@@ -11833,19 +11863,39 @@ f_glob(argvars, rettv)
     int		error = FALSE;
 
     /* When the optional second argument is non-zero, don't remove matches
-    * for 'wildignore' and don't put matches for 'suffixes' at the end. */
-    if (argvars[1].v_type != VAR_UNKNOWN
-				&& get_tv_number_chk(&argvars[1], &error))
-	options |= WILD_KEEP_ALL;
+     * for 'wildignore' and don't put matches for 'suffixes' at the end. */
     rettv->v_type = VAR_STRING;
+    if (argvars[1].v_type != VAR_UNKNOWN)
+    {
+	if (get_tv_number_chk(&argvars[1], &error))
+	    options |= WILD_KEEP_ALL;
+	if (argvars[2].v_type != VAR_UNKNOWN
+				    && get_tv_number_chk(&argvars[2], &error))
+	{
+	    rettv->v_type = VAR_LIST;
+	    rettv->vval.v_list = NULL;
+	}
+    }
     if (!error)
     {
 	ExpandInit(&xpc);
 	xpc.xp_context = EXPAND_FILES;
 	if (p_wic)
 	    options += WILD_ICASE;
-	rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
+	if (rettv->v_type == VAR_STRING)
+	    rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
 						     NULL, options, WILD_ALL);
+	else if (rettv_list_alloc(rettv) != FAIL)
+	{
+	  int i;
+
+	  ExpandOne(&xpc, get_tv_string(&argvars[0]),
+						NULL, options, WILD_ALL_KEEP);
+	  for (i = 0; i < xpc.xp_numfiles; i++)
+	      list_append_string(rettv->vval.v_list, xpc.xp_files[i], -1);
+
+	  ExpandCleanup(&xpc);
+	}
     }
     else
 	rettv->vval.v_string = NULL;
@@ -20442,7 +20492,12 @@ ex_echo(eap)
 		/* Call msg_start() after eval1(), evaluating the expression
 		 * may cause a message to appear. */
 		if (eap->cmdidx == CMD_echo)
+		{
+		    /* Put the output below the command, makes scrolling back
+		     * at more prompt work. */
+		    msg_didout = TRUE;
 		    msg_start();
+		}
 	    }
 	    else if (eap->cmdidx == CMD_echo)
 		msg_puts_attr((char_u *)" ", echo_attr);

src/ex_cmds.c

@@ -5151,10 +5151,13 @@ outofmem:
 
 	if (!global_busy)
 	{
-	    if (endcolumn)
-		coladvance((colnr_T)MAXCOL);
-	    else
-		beginline(BL_WHITE | BL_FIX);
+	    if (!do_ask)  /* when interactive leave cursor on the match */
+	    {
+		if (endcolumn)
+		    coladvance((colnr_T)MAXCOL);
+		else
+		    beginline(BL_WHITE | BL_FIX);
+	    }
 	    if (!do_sub_msg(do_count) && do_ask)
 		MSG("");
 	}
@@ -6726,7 +6729,7 @@ ex_sign(eap)
 	if (idx == SIGNCMD_LIST && *arg == NUL)
 	{
 	    /* ":sign list": list all defined signs */
-	    for (sp = first_sign; sp != NULL; sp = sp->sn_next)
+	    for (sp = first_sign; sp != NULL && !got_int; sp = sp->sn_next)
 		sign_list_defined(sp);
 	}
 	else if (*arg == NUL)

src/ex_getln.c

@@ -3461,6 +3461,7 @@ nextwild(xp, type, options)
  * mode = WILD_PREV:	    use previous match in multiple match, wrap to first
  * mode = WILD_ALL:	    return all matches concatenated
  * mode = WILD_LONGEST:	    return longest matched part
+ * mode = WILD_ALL_KEEP:    get all matches, keep matches
  *
  * options = WILD_LIST_NOTFOUND:    list entries without a match
  * options = WILD_HOME_REPLACE:	    do home_replace() for buffer names
@@ -3584,7 +3585,8 @@ ExpandOne(xp, str, orig, options, mode)
 	    /*
 	     * Check for matching suffixes in file names.
 	     */
-	    if (mode != WILD_ALL && mode != WILD_LONGEST)
+	    if (mode != WILD_ALL && mode != WILD_ALL_KEEP
+						      && mode != WILD_LONGEST)
 	    {
 		if (xp->xp_numfiles)
 		    non_suf_match = xp->xp_numfiles;

src/fileio.c

@@ -9116,6 +9116,15 @@ has_cursormovedI()
     return (first_autopat[(int)EVENT_CURSORMOVEDI] != NULL);
 }
 
+/*
+ * Return TRUE when there is an InsertCharPre autocommand defined.
+ */
+    int
+has_insertcharpre()
+{
+    return (first_autopat[(int)EVENT_INSERTCHARPRE] != NULL);
+}
+
     static int
 apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
     event_T	event;

src/fold.c

@@ -3292,7 +3292,8 @@ foldlevelSyntax(flp)
 /* put_folds() {{{2 */
 #if defined(FEAT_SESSION) || defined(PROTO)
 static int put_folds_recurse __ARGS((FILE *fd, garray_T *gap, linenr_T off));
-static int put_foldopen_recurse __ARGS((FILE *fd, garray_T *gap, linenr_T off));
+static int put_foldopen_recurse __ARGS((FILE *fd, win_T *wp, garray_T *gap, linenr_T off));
+static int put_fold_open_close __ARGS((FILE *fd, fold_T *fp, linenr_T off));
 
 /*
  * Write commands to "fd" to restore the manual folds in window "wp".
@@ -3312,7 +3313,7 @@ put_folds(fd, wp)
 
     /* If some folds are manually opened/closed, need to restore that. */
     if (wp->w_fold_manual)
-	return put_foldopen_recurse(fd, &wp->w_folds, (linenr_T)0);
+	return put_foldopen_recurse(fd, wp, &wp->w_folds, (linenr_T)0);
 
     return OK;
 }
@@ -3352,12 +3353,14 @@ put_folds_recurse(fd, gap, off)
  * Returns FAIL when writing failed.
  */
     static int
-put_foldopen_recurse(fd, gap, off)
+put_foldopen_recurse(fd, wp, gap, off)
     FILE	*fd;
+    win_T	*wp;
     garray_T	*gap;
     linenr_T	off;
 {
     int		i;
+    int		level;
     fold_T	*fp;
 
     fp = (fold_T *)gap->ga_data;
@@ -3367,27 +3370,60 @@ put_foldopen_recurse(fd, gap, off)
 	{
 	    if (fp->fd_nested.ga_len > 0)
 	    {
-		/* open/close nested folds while this fold is open */
+		/* open nested folds while this fold is open */
 		if (fprintf(fd, "%ld", fp->fd_top + off) < 0
 			|| put_eol(fd) == FAIL
 			|| put_line(fd, "normal zo") == FAIL)
 		    return FAIL;
-		if (put_foldopen_recurse(fd, &fp->fd_nested, off + fp->fd_top)
+		if (put_foldopen_recurse(fd, wp, &fp->fd_nested,
+							     off + fp->fd_top)
 			== FAIL)
 		    return FAIL;
+		/* close the parent when needed */
+		if (fp->fd_flags == FD_CLOSED)
+		{
+		    if (put_fold_open_close(fd, fp, off) == FAIL)
+			return FAIL;
+		}
+	    }
+	    else
+	    {
+		/* Open or close the leaf according to the window foldlevel.
+		 * Do not close a leaf that is already closed, as it will close
+		 * the parent. */
+		level = foldLevelWin(wp, off + fp->fd_top);
+		if ((fp->fd_flags == FD_CLOSED && wp->w_p_fdl >= level)
+			|| (fp->fd_flags != FD_CLOSED && wp->w_p_fdl < level))
+		if (put_fold_open_close(fd, fp, off) == FAIL)
+		    return FAIL;
 	    }
-	    if (fprintf(fd, "%ld", fp->fd_top + off) < 0
-		    || put_eol(fd) == FAIL
-		    || fprintf(fd, "normal z%c",
-				    fp->fd_flags == FD_CLOSED ? 'c' : 'o') < 0
-		    || put_eol(fd) == FAIL)
-		return FAIL;
 	}
 	++fp;
     }
 
     return OK;
 }
+
+/* put_fold_open_close() {{{2 */
+/*
+ * Write the open or close command to "fd".
+ * Returns FAIL when writing failed.
+ */
+    static int
+put_fold_open_close(fd, fp, off)
+    FILE	*fd;
+    fold_T	*fp;
+    linenr_T	off;
+{
+    if (fprintf(fd, "%ld", fp->fd_top + off) < 0
+	    || put_eol(fd) == FAIL
+	    || fprintf(fd, "normal z%c",
+			   fp->fd_flags == FD_CLOSED ? 'c' : 'o') < 0
+	    || put_eol(fd) == FAIL)
+	return FAIL;
+
+    return OK;
+}
 #endif /* FEAT_SESSION */
 
 /* }}}1 */

src/if_perl.xs

@@ -913,24 +913,6 @@ int win_count() { return 1; }
 win_T *win_find_nr(int n) { return curwin; }
 #endif
 
-XS(XS_VIM_Msg);
-XS(XS_VIM_SetOption);
-XS(XS_VIM_DoCommand);
-XS(XS_VIM_Eval);
-XS(XS_VIM_Buffers);
-XS(XS_VIM_Windows);
-XS(XS_VIWIN_DESTROY);
-XS(XS_VIWIN_Buffer);
-XS(XS_VIWIN_SetHeight);
-XS(XS_VIWIN_Cursor);
-XS(XS_VIBUF_DESTROY);
-XS(XS_VIBUF_Name);
-XS(XS_VIBUF_Number);
-XS(XS_VIBUF_Count);
-XS(XS_VIBUF_Get);
-XS(XS_VIBUF_Set);
-XS(XS_VIBUF_Delete);
-XS(XS_VIBUF_Append);
 XS(boot_VIM);
 
     static void

src/mbyte.c

@@ -4504,7 +4504,8 @@ im_show_info(void)
     vgetc_busy = TRUE;
     showmode();
     vgetc_busy = old_vgetc_busy;
-    setcursor();
+    if ((State & NORMAL) || (State & INSERT))
+	setcursor();
     out_flush();
 }
 

src/move.c

@@ -2843,7 +2843,10 @@ halfpage(flag, Prenum)
 do_check_cursorbind()
 {
     linenr_T	line = curwin->w_cursor.lnum;
-    colnr_T	col =  curwin->w_cursor.col;
+    colnr_T	col = curwin->w_cursor.col;
+# ifdef FEAT_VIRTUALEDIT
+    colnr_T	coladd = curwin->w_cursor.coladd;
+# endif
     win_T	*old_curwin = curwin;
     buf_T	*old_curbuf = curbuf;
     int		restart_edit_save;
@@ -2875,6 +2878,9 @@ do_check_cursorbind()
 # endif
 		curwin->w_cursor.lnum = line;
 	    curwin->w_cursor.col = col;
+# ifdef FEAT_VIRTUALEDIT
+	    curwin->w_cursor.coladd = coladd;
+# endif
 
 	    /* Make sure the cursor is in a valid position.  Temporarily set
 	     * "restart_edit" to allow the cursor to be beyond the EOL. */

src/ops.c

@@ -1957,6 +1957,9 @@ op_delete(oap)
 	    ++curwin->w_cursor.lnum;
 	    del_lines((long)(oap->line_count - 2), FALSE);
 
+	    if (delete_last_line)
+		oap->end.lnum = curbuf->b_ml.ml_line_count;
+
 	    n = (oap->end.col + 1 - !oap->inclusive);
 	    if (oap->inclusive && delete_last_line
 		    && n > (int)STRLEN(ml_get(oap->end.lnum)))
@@ -2599,7 +2602,8 @@ op_insert(oap, count1)
 	firstline = ml_get(oap->start.lnum) + bd.textcol;
 	if (oap->op_type == OP_APPEND)
 	    firstline += bd.textlen;
-	if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
+	if (pre_textlen >= 0
+		     && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
 	{
 	    ins_text = vim_strnsave(firstline, (int)ins_len);
 	    if (ins_text != NULL)

src/po/Makefile

@@ -20,6 +20,7 @@ LANGUAGES = \
 		ko \
 		ko.UTF-8 \
 		nb \
+		nl \
 		no \
 		pl \
 		pt_BR \
@@ -49,6 +50,7 @@ MOFILES = \
 		ko.mo \
 		ko.UTF-8.mo \
 		nb.mo \
+		nl.mo \
 		no.mo \
 		pl.mo \
 		pt_BR.mo \
@@ -88,6 +90,7 @@ CHECKFILES = \
 		ko.ck \
 		ko.UTF-8.ck \
 		nb.ck \
+		nl.ck \
 		no.ck \
 		pl.ck \
 		pt_BR.ck \

src/proto/fileio.pro

@@ -44,6 +44,7 @@ int has_cursorhold __ARGS((void));
 int trigger_cursorhold __ARGS((void));
 int has_cursormoved __ARGS((void));
 int has_cursormovedI __ARGS((void));
+int has_insertcharpre __ARGS((void));
 void block_autocmds __ARGS((void));
 void unblock_autocmds __ARGS((void));
 int has_autocmd __ARGS((event_T event, char_u *sfname, buf_T *buf));

src/quickfix.c

@@ -2995,11 +2995,28 @@ ex_cfile(eap)
 {
     win_T	*wp = NULL;
     qf_info_T	*qi = &ql_info;
+#ifdef FEAT_AUTOCMD
+    char_u	*au_name = NULL;
+#endif
 
     if (eap->cmdidx == CMD_lfile || eap->cmdidx == CMD_lgetfile
-	|| eap->cmdidx == CMD_laddfile)
+					       || eap->cmdidx == CMD_laddfile)
 	wp = curwin;
 
+#ifdef FEAT_AUTOCMD
+    switch (eap->cmdidx)
+    {
+	case CMD_cfile:	    au_name = (char_u *)"cfile"; break;
+	case CMD_cgetfile:  au_name = (char_u *)"cgetfile"; break;
+	case CMD_caddfile:  au_name = (char_u *)"caddfile"; break;
+	case CMD_lfile:	    au_name = (char_u *)"lfile"; break;
+	case CMD_lgetfile:  au_name = (char_u *)"lgetfile"; break;
+	case CMD_laddfile:  au_name = (char_u *)"laddfile"; break;
+	default: break;
+    }
+    if (au_name != NULL)
+	apply_autocmds(EVENT_QUICKFIXCMDPRE, au_name, NULL, FALSE, curbuf);
+#endif
 #ifdef FEAT_BROWSE
     if (cmdmod.browse)
     {
@@ -3031,10 +3048,22 @@ ex_cfile(eap)
 				  && (eap->cmdidx == CMD_cfile
 					     || eap->cmdidx == CMD_lfile))
     {
+#ifdef FEAT_AUTOCMD
+	if (au_name != NULL)
+	    apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, NULL, FALSE, curbuf);
+#endif
 	if (wp != NULL)
 	    qi = GET_LOC_LIST(wp);
 	qf_jump(qi, 0, 0, eap->forceit);	/* display first error */
     }
+
+    else
+    {
+#ifdef FEAT_AUTOCMD
+	if (au_name != NULL)
+	    apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, NULL, FALSE, curbuf);
+#endif
+    }
 }
 
 /*

src/screen.c

@@ -5371,6 +5371,12 @@ screen_line(row, coloff, endcol, clear_width
 # define CHAR_CELLS 1
 #endif
 
+    /* Check for illegal row and col, just in case. */
+    if (row >= Rows)
+	row = Rows - 1;
+    if (endcol > Columns)
+	endcol = Columns;
+
 # ifdef FEAT_CLIPBOARD
     clip_may_clear_selection(row, row);
 # endif

src/syntax.c

@@ -6516,8 +6516,6 @@ static char *(highlight_init_both[]) =
 	     "DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red"),
 #endif
 #ifdef FEAT_INS_EXPAND
-	CENT("PmenuThumb cterm=reverse",
-	     "PmenuThumb cterm=reverse gui=reverse"),
 	CENT("PmenuSbar ctermbg=Grey",
 	     "PmenuSbar ctermbg=Grey guibg=Grey"),
 #endif
@@ -6557,10 +6555,12 @@ static char *(highlight_init_light[]) =
 	     "SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl"),
 #endif
 #ifdef FEAT_INS_EXPAND
-	CENT("Pmenu ctermbg=LightMagenta",
-	     "Pmenu ctermbg=LightMagenta guibg=LightMagenta"),
-	CENT("PmenuSel ctermbg=LightGrey",
-	     "PmenuSel ctermbg=LightGrey guibg=Grey"),
+	CENT("PmenuThumb ctermbg=Black",
+	     "PmenuThumb ctermbg=Black guibg=Black"),
+	CENT("Pmenu ctermbg=LightMagenta ctermfg=Black",
+	     "Pmenu ctermbg=LightMagenta ctermfg=Black guibg=LightMagenta"),
+	CENT("PmenuSel ctermbg=LightGrey ctermfg=Black",
+	     "PmenuSel ctermbg=LightGrey ctermfg=Black guibg=Grey"),
 #endif
 	CENT("SpecialKey term=bold ctermfg=DarkBlue",
 	     "SpecialKey term=bold ctermfg=DarkBlue guifg=Blue"),
@@ -6645,10 +6645,12 @@ static char *(highlight_init_dark[]) =
 	     "SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl"),
 #endif
 #ifdef FEAT_INS_EXPAND
-	CENT("Pmenu ctermbg=Magenta",
-	     "Pmenu ctermbg=Magenta guibg=Magenta"),
-	CENT("PmenuSel ctermbg=DarkGrey",
-	     "PmenuSel ctermbg=DarkGrey guibg=DarkGrey"),
+	CENT("PmenuThumb ctermbg=White",
+	     "PmenuThumb ctermbg=White guibg=White"),
+	CENT("Pmenu ctermbg=Magenta ctermfg=Black",
+	     "Pmenu ctermbg=Magenta ctermfg=Black guibg=Magenta"),
+	CENT("PmenuSel ctermbg=DarkGrey ctermfg=Black",
+	     "PmenuSel ctermbg=DarkGrey ctermfg=Black guibg=DarkGrey"),
 #endif
 	CENT("Title term=bold ctermfg=LightMagenta",
 	     "Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta"),

src/testdir/test62.in

@@ -49,7 +49,7 @@ STARTTEST
 :tabclose
 :call append(line('$'), test_status)
 :"
-:"
+:if has('gui') || has('clientserver')
 :" Test for ":tab drop exist-file" to keep current window.
 :sp test1
 :tab drop test1
@@ -85,6 +85,12 @@ STARTTEST
 :tabclose
 :q
 :call append(line('$'), test_status)
+:else
+:" :drop not supported
+:call append(line('$'), 'tab drop 1: pass')
+:call append(line('$'), 'tab drop 2: pass')
+:call append(line('$'), 'tab drop 3: pass')
+:endif
 :"
 :"
 :/^Results/,$w! test.out

src/version.c

@@ -714,6 +714,42 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    477,
+/**/
+    476,
+/**/
+    475,
+/**/
+    474,
+/**/
+    473,
+/**/
+    472,
+/**/
+    471,
+/**/
+    470,
+/**/
+    469,
+/**/
+    468,
+/**/
+    467,
+/**/
+    466,
+/**/
+    465,
+/**/
+    464,
+/**/
+    463,
+/**/
+    462,
+/**/
+    461,
+/**/
+    460,
 /**/
     459,
 /**/
@@ -2179,12 +2215,9 @@ do_intro_line(row, mesg, add_version, attr)
 	    /* Check for 9.9x or 9.9xx, alpha/beta version */
 	    if (isalpha((int)vers[3]))
 	    {
-		if (isalpha((int)vers[4]))
-		    sprintf((char *)vers + 5, ".%d%s", highest_patch(),
-							   mediumVersion + 5);
-		else
-		    sprintf((char *)vers + 4, ".%d%s", highest_patch(),
-							   mediumVersion + 4);
+		int len = (isalpha((int)vers[4])) ? 5 : 4;
+		sprintf((char *)vers + len, ".%d%s", highest_patch(),
+							 mediumVersion + len);
 	    }
 	    else
 		sprintf((char *)vers + 3, ".%d", highest_patch());

src/vim.h

@@ -794,6 +794,7 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname);
 #define WILD_PREV		5
 #define WILD_ALL		6
 #define WILD_LONGEST		7
+#define WILD_ALL_KEEP		8
 
 #define WILD_LIST_NOTFOUND	1
 #define WILD_HOME_REPLACE	2

src/window.c

@@ -3676,13 +3676,6 @@ enter_tabpage(tp, old_curbuf)
     win_enter_ext(tp->tp_curwin, FALSE, TRUE);
     prevwin = next_prevwin;
 
-#ifdef FEAT_AUTOCMD
-    apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
-
-    if (old_curbuf != curbuf)
-	apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
-#endif
-
     last_status(FALSE);		/* status line may appear or disappear */
     (void)win_comp_pos();	/* recompute w_winrow for all windows */
     must_redraw = CLEAR;	/* need to redraw everything */
@@ -3712,6 +3705,14 @@ enter_tabpage(tp, old_curbuf)
     gui_may_update_scrollbars();
 #endif
 
+#ifdef FEAT_AUTOCMD
+    /* Apply autocommands after updating the display, when 'rows' and
+     * 'columns' have been set correctly. */
+    apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+    if (old_curbuf != curbuf)
+	apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+#endif
+
     redraw_all_later(CLEAR);
 }