changeset 5294:359743c1f59a v7.4

release version 7.4
author Bram Moolenaar <bram@vim.org>
date Sat, 10 Aug 2013 15:00:24 +0200
parents 40f4f573218c
children a643d80b6507
files Contents Makefile README.txt README_ami.txt README_amibin.txt README_amisrc.txt README_bindos.txt README_dos.txt README_extra.txt README_mac.txt README_ole.txt README_os2.txt README_os390.txt README_src.txt README_srcdos.txt README_unix.txt README_vms.txt README_w32s.txt nsis/gvim.nsi runtime/doc/arabic.txt runtime/doc/autocmd.txt runtime/doc/change.txt runtime/doc/cmdline.txt runtime/doc/debug.txt runtime/doc/debugger.txt runtime/doc/develop.txt runtime/doc/diff.txt runtime/doc/digraph.txt runtime/doc/editing.txt runtime/doc/eval.txt runtime/doc/farsi.txt runtime/doc/filetype.txt runtime/doc/fold.txt runtime/doc/ft_ada.txt runtime/doc/ft_sql.txt runtime/doc/gui.txt runtime/doc/gui_w16.txt runtime/doc/gui_w32.txt runtime/doc/gui_x11.txt runtime/doc/hangulin.txt runtime/doc/hebrew.txt runtime/doc/help.txt runtime/doc/helphelp.txt runtime/doc/howto.txt runtime/doc/if_cscop.txt runtime/doc/if_lua.txt runtime/doc/if_mzsch.txt runtime/doc/if_ole.txt runtime/doc/if_perl.txt runtime/doc/if_pyth.txt runtime/doc/if_ruby.txt runtime/doc/if_sniff.txt runtime/doc/if_tcl.txt runtime/doc/indent.txt runtime/doc/index.txt runtime/doc/insert.txt runtime/doc/intro.txt runtime/doc/map.txt runtime/doc/mbyte.txt runtime/doc/message.txt runtime/doc/mlang.txt runtime/doc/motion.txt runtime/doc/netbeans.txt runtime/doc/options.txt runtime/doc/os_390.txt runtime/doc/os_amiga.txt runtime/doc/os_beos.txt runtime/doc/os_dos.txt runtime/doc/os_mac.txt runtime/doc/os_mint.txt runtime/doc/os_msdos.txt runtime/doc/os_os2.txt runtime/doc/os_qnx.txt runtime/doc/os_risc.txt runtime/doc/os_unix.txt runtime/doc/os_vms.txt runtime/doc/os_win32.txt runtime/doc/pattern.txt runtime/doc/pi_getscript.txt runtime/doc/pi_gzip.txt runtime/doc/pi_netrw.txt runtime/doc/pi_paren.txt runtime/doc/pi_spec.txt runtime/doc/pi_tar.txt runtime/doc/pi_vimball.txt runtime/doc/pi_zip.txt runtime/doc/print.txt runtime/doc/quickfix.txt runtime/doc/quickref.txt runtime/doc/quotes.txt runtime/doc/recover.txt runtime/doc/remote.txt runtime/doc/repeat.txt runtime/doc/rileft.txt runtime/doc/russian.txt runtime/doc/scroll.txt runtime/doc/sign.txt runtime/doc/spell.txt runtime/doc/sponsor.txt runtime/doc/starting.txt runtime/doc/syntax.txt runtime/doc/tabpage.txt runtime/doc/tagsrch.txt runtime/doc/term.txt runtime/doc/tips.txt runtime/doc/todo.txt runtime/doc/uganda.txt runtime/doc/undo.txt runtime/doc/usr_01.txt runtime/doc/usr_02.txt runtime/doc/usr_03.txt runtime/doc/usr_04.txt runtime/doc/usr_05.txt runtime/doc/usr_06.txt runtime/doc/usr_07.txt runtime/doc/usr_08.txt runtime/doc/usr_09.txt runtime/doc/usr_10.txt runtime/doc/usr_11.txt runtime/doc/usr_12.txt runtime/doc/usr_20.txt runtime/doc/usr_21.txt runtime/doc/usr_22.txt runtime/doc/usr_23.txt runtime/doc/usr_24.txt runtime/doc/usr_25.txt runtime/doc/usr_26.txt runtime/doc/usr_27.txt runtime/doc/usr_28.txt runtime/doc/usr_29.txt runtime/doc/usr_30.txt runtime/doc/usr_31.txt runtime/doc/usr_32.txt runtime/doc/usr_40.txt runtime/doc/usr_41.txt runtime/doc/usr_42.txt runtime/doc/usr_43.txt runtime/doc/usr_44.txt runtime/doc/usr_45.txt runtime/doc/usr_90.txt runtime/doc/usr_toc.txt runtime/doc/various.txt runtime/doc/version4.txt runtime/doc/version5.txt runtime/doc/version6.txt runtime/doc/version7.txt runtime/doc/vi_diff.txt runtime/doc/visual.txt runtime/doc/windows.txt runtime/doc/workshop.txt runtime/indent/php.vim src/GvimExt/GvimExt.reg src/Makefile src/gui_w48.c src/po/it.po src/version.c src/version.h src/vim.def src/vim16.def
diffstat 159 files changed, 770 insertions(+), 399 deletions(-) [+]
line wrap: on
line diff
--- a/Contents
+++ b/Contents
@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX t
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 7.4b.  Also runs under UNIX, MSDOS and other systems.
-		vim74brt.tgz  contains the documentation and syntax files.
-		vim74bbin.tgz contains the binaries.
-		vim74bsrc.tgz contains the sources.
+		Version 7.4.  Also runs under UNIX, MSDOS and other systems.
+		vim74rt.tgz  contains the documentation and syntax files.
+		vim74bin.tgz contains the binaries.
+		vim74src.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ all install uninstall tools config confi
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 7
-MINOR = 4b
+MINOR = 4
 
 # Uncomment this line if the Win32s version is to be included.
 # DOSBIN_S =  dosbin_s
@@ -92,8 +92,6 @@ MINOR = 4b
 #   runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt.  For a
 #   minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def,
 #   src/gvim.exe.mnf.
-# - Adjust the date and other info in src/version.h.
-# - Correct included_patches[] in src/version.c.
 # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, MZscheme, Lua (if
 #   you can make it all work), Cscope and "huge" features.  Exclude workshop
 #   and SNiFF.
@@ -102,8 +100,14 @@ MINOR = 4b
 # - With these features: "make depend" (works best with gcc).
 # - If you have a lint program: "make lint" and check the output (ignore GTK
 #   warnings).
-# - Enable the efence library in "src/Makefile" and run "make test".  Disable
-#   Python and Ruby to avoid trouble with threads (efence is not threadsafe).
+# - If you have valgrind, enable it in src/testdir/Makefile and run "make
+#   test".  Enable EXITFREE, disable GUI, scheme and tcl to avoid false alarms.
+#   Check the valgrind output.
+# - If you have the efence library, enable it in "src/Makefile" and run "make
+#   test".  Disable Python and Ruby to avoid trouble with threads (efence is
+#   not threadsafe).
+# - Adjust the date and other info in src/version.h.
+# - Correct included_patches[] in src/version.c.
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
 # - Check for missing options in runtime/optwin.vim et al. (with check.vim).
 # - Do "make menu" to update the runtime/synmenu.vim file.
@@ -111,8 +115,8 @@ MINOR = 4b
 # - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
 #   ADDITIONS".
 # - In runtime/doc run "make" and "make html" to check for errors.
-# - Check if src/Makefile and src/feature.h don't contain any personal
-#   preferences or the GTK, Perl, etc. mentioned above.
+# - Check if src/Makefile, src/testdir/Makefile and src/feature.h don't contain
+#   any personal preferences or the changes mentioned above.
 # - Check file protections to be "644" for text and "755" for executables (run
 #   the "check" script).
 # - Check compiling on Amiga, MS-DOS and MS-Windows.
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 7.4b of Vim: Vi IMproved.
+README.txt for version 7.4 of Vim: Vi IMproved.
 
 
 WHAT IS VIM
--- a/README_ami.txt
+++ b/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.4b of Vim: Vi IMproved.
+README_ami.txt for version 7.4 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
--- a/README_amibin.txt
+++ b/README_amibin.txt
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.4b of Vim: Vi IMproved.
+README_amibin.txt for version 7.4 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
--- a/README_amisrc.txt
+++ b/README_amisrc.txt
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.4b of Vim: Vi IMproved.
+README_amisrc.txt for version 7.4 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
--- a/README_bindos.txt
+++ b/README_bindos.txt
@@ -1,4 +1,4 @@
-README_bindos.txt for version 7.4b of Vim: Vi IMproved.
+README_bindos.txt for version 7.4 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
--- a/README_dos.txt
+++ b/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.4b of Vim: Vi IMproved.
+README_dos.txt for version 7.4 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.
--- a/README_extra.txt
+++ b/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 7.4b of Vim: Vi IMproved.
+README_extra.txt for version 7.4 of Vim: Vi IMproved.
 
 These extra files of Vim are for special purposes.  This README explains what
 the files are for.  For general information about Vim, see the "README.txt"
--- a/README_mac.txt
+++ b/README_mac.txt
@@ -1,4 +1,4 @@
-README_mac.txt for version 7.4b of Vim: Vi IMproved.
+README_mac.txt for version 7.4 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Macintosh systems.
 See "README.txt" for general information about Vim.
--- a/README_ole.txt
+++ b/README_ole.txt
@@ -1,4 +1,4 @@
-README_ole.txt for version 7.4b of Vim: Vi IMproved.
+README_ole.txt for version 7.4 of Vim: Vi IMproved.
 
 This archive contains gvim.exe with OLE interface and VisVim.
 This version of gvim.exe can also load a number of interface dynamically (you
--- a/README_os2.txt
+++ b/README_os2.txt
@@ -1,4 +1,4 @@
-README_os2.txt for version 7.4b of Vim: Vi IMproved.
+README_os2.txt for version 7.4 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on OS/2 systems.
 See "README.txt" for general information about Vim.
--- a/README_os390.txt
+++ b/README_os390.txt
@@ -1,4 +1,4 @@
-README_zOS.txt for version 7.4b of Vim: Vi IMproved.
+README_zOS.txt for version 7.4 of Vim: Vi IMproved.
 
 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.
--- a/README_src.txt
+++ b/README_src.txt
@@ -1,4 +1,4 @@
-README_src.txt for version 7.4b of Vim: Vi IMproved.
+README_src.txt for version 7.4 of Vim: Vi IMproved.
 
 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).
--- a/README_srcdos.txt
+++ b/README_srcdos.txt
@@ -1,4 +1,4 @@
-README_srcdos.txt for version 7.4b of Vim: Vi IMproved.
+README_srcdos.txt for version 7.4 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
--- a/README_unix.txt
+++ b/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.4b of Vim: Vi IMproved.
+README_unix.txt for version 7.4 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
--- a/README_vms.txt
+++ b/README_vms.txt
@@ -1,4 +1,4 @@
-README_vms.txt for version 7.4b of Vim: Vi IMproved.
+README_vms.txt for version 7.4 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.
--- a/README_w32s.txt
+++ b/README_w32s.txt
@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.4b of Vim: Vi IMproved.
+README_w32s.txt for version 7.4 of Vim: Vi IMproved.
 
 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -22,7 +22,7 @@
 !define HAVE_NLS
 
 !define VER_MAJOR 7
-!define VER_MINOR 4b
+!define VER_MINOR 4
 
 # ----------- No configurable settings below this line -----------
 
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 7.4b.  Last change: 2010 Nov 13
+*arabic.txt*	For Vim version 7.4.  Last change: 2010 Nov 13
 
 
 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.4b.  Last change: 2013 Aug 02
+*autocmd.txt*   For Vim version 7.4.  Last change: 2013 Aug 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -952,7 +952,7 @@ the autocommand is executed.  This is di
 
 							*file-pattern*
 The pattern is interpreted like mostly used in file names:
-	*	matches any sequence of characters; Unusal: includes path
+	*	matches any sequence of characters; Unusual: includes path
 		separators
 	?	matches any single character
 	\?	matches a '?'
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.4b.  Last change: 2013 Jul 17
+*change.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.4b.  Last change: 2013 Mar 16
+*cmdline.txt*   For Vim version 7.4.  Last change: 2013 Mar 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.4b.  Last change: 2012 Feb 11
+*debug.txt*     For Vim version 7.4.  Last change: 2012 Feb 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.4b.  Last change: 2005 Mar 29
+*debugger.txt*  For Vim version 7.4.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.4b.  Last change: 2013 Apr 27
+*develop.txt*   For Vim version 7.4.  Last change: 2013 Apr 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.4b.  Last change: 2013 Jul 07
+*diff.txt*      For Vim version 7.4.  Last change: 2013 Jul 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.4b.  Last change: 2011 Jan 15
+*digraph.txt*   For Vim version 7.4.  Last change: 2011 Jan 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.4b.  Last change: 2013 Aug 03
+*editing.txt*   For Vim version 7.4.  Last change: 2013 Aug 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.4b.  Last change: 2013 Aug 03
+*eval.txt*	For Vim version 7.4.  Last change: 2013 Aug 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.4b.  Last change: 2010 Aug 07
+*farsi.txt*     For Vim version 7.4.  Last change: 2010 Aug 07
 
 
 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.4b.  Last change: 2013 May 25
+*filetype.txt*  For Vim version 7.4.  Last change: 2013 May 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.4b.  Last change: 2010 May 13
+*fold.txt*      For Vim version 7.4.  Last change: 2010 May 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/ft_ada.txt
+++ b/runtime/doc/ft_ada.txt
@@ -1,4 +1,4 @@
-*ft_ada.txt*	For Vim version 7.4b.  Last change: 2010 Jul 20
+*ft_ada.txt*	For Vim version 7.4.  Last change: 2010 Jul 20
 
 
 		    ADA FILE TYPE PLUG-INS REFERENCE MANUAL~
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -1,4 +1,4 @@
-*ft_sql.txt*	For Vim version 7.4b.  Last change: 2013 May 15
+*ft_sql.txt*	For Vim version 7.4.  Last change: 2013 May 15
 
 by David Fishburn
 
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.4b.  Last change: 2013 Jun 12
+*gui.txt*       For Vim version 7.4.  Last change: 2013 Jun 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/gui_w16.txt
+++ b/runtime/doc/gui_w16.txt
@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.4b.  Last change: 2005 Mar 29
+*gui_w16.txt*   For Vim version 7.4.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.4b.  Last change: 2012 Aug 04
+*gui_w32.txt*   For Vim version 7.4.  Last change: 2012 Aug 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.4b.  Last change: 2011 Sep 14
+*gui_x11.txt*   For Vim version 7.4.  Last change: 2011 Sep 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.4b.  Last change: 2009 Jun 24
+*hangulin.txt*  For Vim version 7.4.  Last change: 2009 Jun 24
 
 
 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
--- a/runtime/doc/hebrew.txt
+++ b/runtime/doc/hebrew.txt
@@ -1,4 +1,4 @@
-*hebrew.txt*    For Vim version 7.4b.  Last change: 2007 Jun 14
+*hebrew.txt*    For Vim version 7.4.  Last change: 2007 Jun 14
 
 
 	   VIM REFERENCE MANUAL    by Ron Aaron (and Avner Lottem)
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.4b.  Last change: 2012 Dec 06
+*help.txt*	For Vim version 7.4.  Last change: 2012 Dec 06
 
 			VIM - main help file
 									 k
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 7.4b.  Last change: 2012 Nov 28
+*helphelp.txt*	For Vim version 7.4.  Last change: 2012 Nov 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/howto.txt
+++ b/runtime/doc/howto.txt
@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 7.4b.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 7.4.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.4b.  Last change: 2011 Jun 12
+*if_cscop.txt*  For Vim version 7.4.  Last change: 2011 Jun 12
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn
--- a/runtime/doc/if_lua.txt
+++ b/runtime/doc/if_lua.txt
@@ -1,4 +1,4 @@
-*if_lua.txt*    For Vim version 7.4b.  Last change: 2012 Jun 29
+*if_lua.txt*    For Vim version 7.4.  Last change: 2012 Jun 29
 
 
 		  VIM REFERENCE MANUAL    by Luis Carvalho
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 7.4b.  Last change: 2012 Dec 17
+*if_mzsch.txt*  For Vim version 7.4.  Last change: 2012 Dec 17
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 7.4b.  Last change: 2008 Aug 16
+*if_ole.txt*    For Vim version 7.4.  Last change: 2008 Aug 16
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.4b.  Last change: 2012 Oct 25
+*if_perl.txt*   For Vim version 7.4.  Last change: 2012 Oct 25
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.4b.  Last change: 2013 Jul 10
+*if_pyth.txt*   For Vim version 7.4.  Last change: 2013 Jul 10
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.4b.  Last change: 2012 Aug 02
+*if_ruby.txt*   For Vim version 7.4.  Last change: 2012 Aug 02
 
 
 		  VIM REFERENCE MANUAL    by Shugo Maeda
--- a/runtime/doc/if_sniff.txt
+++ b/runtime/doc/if_sniff.txt
@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 7.4b.  Last change: 2005 Mar 29
+*if_sniff.txt*	For Vim version 7.4.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 7.4b.  Last change: 2012 Aug 02
+*if_tcl.txt*    For Vim version 7.4.  Last change: 2012 Aug 02
 
 
 		  VIM REFERENCE MANUAL    by Ingo Wilken
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.4b.  Last change: 2013 Aug 03
+*indent.txt*    For Vim version 7.4.  Last change: 2013 Aug 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.4b.  Last change: 2013 Jul 17
+*index.txt*     For Vim version 7.4.  Last change: 2013 Jul 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.4b.  Last change: 2013 Jul 12
+*insert.txt*    For Vim version 7.4.  Last change: 2013 Jul 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.4b.  Last change: 2013 Jun 17
+*intro.txt*     For Vim version 7.4.  Last change: 2013 Jun 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4b.  Last change: 2013 Jul 18
+*map.txt*       For Vim version 7.4.  Last change: 2013 Aug 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -380,11 +380,12 @@ it's just used here for this situation.
    The simplest way to load a set of related language mappings is by using the
 'keymap' option.  See |45.5|.
    In Insert mode and in Command-line mode the mappings can be disabled with
-the CTRL-^ command |i_CTRL-^| |c_CTRL-^|.  When starting to enter a normal
-command line (not a search pattern) the mappings are disabled until a CTRL-^
-is typed.  The state last used is remembered for Insert mode and Search
-patterns separately.  The state for Insert mode is also used when typing a
-character as an argument to command like "f" or "t".
+the CTRL-^ command |i_CTRL-^| |c_CTRL-^| These commands change the value of
+the 'iminsert' option.  When starting to enter a normal command line (not a
+search pattern) the mappings are disabled until a CTRL-^ is typed.  The state
+last used is remembered for Insert mode and Search patterns separately.  The
+state for Insert mode is also used when typing a character as an argument to
+command like "f" or "t".
    Language mappings will never be applied to already mapped characters.  They
 are only used for typed characters.  This assumes that the language mapping
 was already done when typing the mapping.
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.4b.  Last change: 2013 May 18
+*mbyte.txt*     For Vim version 7.4.  Last change: 2013 May 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.4b.  Last change: 2013 Feb 23
+*message.txt*   For Vim version 7.4.  Last change: 2013 Feb 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.4b.  Last change: 2012 Jan 15
+*mlang.txt*     For Vim version 7.4.  Last change: 2012 Jan 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.4b.  Last change: 2013 Jul 17
+*motion.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.4b.  Last change: 2012 Jan 26
+*netbeans.txt*  For Vim version 7.4.  Last change: 2012 Jan 26
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.4b.  Last change: 2013 Jul 09
+*options.txt*	For Vim version 7.4.  Last change: 2013 Jul 09
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
--- a/runtime/doc/os_390.txt
+++ b/runtime/doc/os_390.txt
@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.4b.  Last change: 2010 May 30
+*os_390.txt*    For Vim version 7.4.  Last change: 2010 May 30
 
 
 		  VIM REFERENCE MANUAL	  by Ralf Schandl
--- a/runtime/doc/os_amiga.txt
+++ b/runtime/doc/os_amiga.txt
@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 7.4b.  Last change: 2010 Aug 14
+*os_amiga.txt*  For Vim version 7.4.  Last change: 2010 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_beos.txt
+++ b/runtime/doc/os_beos.txt
@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 7.4b.  Last change: 2010 Aug 14
+*os_beos.txt*	For Vim version 7.4.  Last change: 2010 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_dos.txt
+++ b/runtime/doc/os_dos.txt
@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 7.4b.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 7.4.  Last change: 2006 Mar 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_mac.txt
+++ b/runtime/doc/os_mac.txt
@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 7.4b.  Last change: 2006 Apr 30
+*os_mac.txt*    For Vim version 7.4.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
--- a/runtime/doc/os_mint.txt
+++ b/runtime/doc/os_mint.txt
@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.4b.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 7.4.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
--- a/runtime/doc/os_msdos.txt
+++ b/runtime/doc/os_msdos.txt
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.4b.  Last change: 2005 Mar 29
+*os_msdos.txt*  For Vim version 7.4.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_os2.txt
+++ b/runtime/doc/os_os2.txt
@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 7.4b.  Last change: 2007 Apr 22
+*os_os2.txt*    For Vim version 7.4.  Last change: 2007 Apr 22
 
 
 		  VIM REFERENCE MANUAL    by Paul Slootman
--- a/runtime/doc/os_qnx.txt
+++ b/runtime/doc/os_qnx.txt
@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 7.4b.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 7.4.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Julian Kinraid
--- a/runtime/doc/os_risc.txt
+++ b/runtime/doc/os_risc.txt
@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 7.4b.  Last change: 2011 May 10
+*os_risc.txt*   For Vim version 7.4.  Last change: 2011 May 10
 
 
 		  VIM REFERENCE MANUAL    by Thomas Leonard
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 7.4b.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 7.4.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.4b.  Last change: 2011 Aug 14
+*os_vms.txt*    For Vim version 7.4.  Last change: 2011 Aug 14
 
 
 		  VIM REFERENCE MANUAL
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.4b.  Last change: 2012 May 18
+*os_win32.txt*  For Vim version 7.4.  Last change: 2012 May 18
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.4b.  Last change: 2013 Jul 06
+*pattern.txt*   For Vim version 7.4.  Last change: 2013 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/pi_getscript.txt
+++ b/runtime/doc/pi_getscript.txt
@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 7.4b.  Last change: 2012 Apr 07
+*pi_getscript.txt*  For Vim version 7.4.  Last change: 2012 Apr 07
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 7.4b.  Last change: 2012 Jul 19
+*pi_gzip.txt*   For Vim version 7.4.  Last change: 2012 Jul 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 7.4b.  Last change: 2013 May 18
+*pi_netrw.txt*  For Vim version 7.4.  Last change: 2013 May 18
 
 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
--- a/runtime/doc/pi_paren.txt
+++ b/runtime/doc/pi_paren.txt
@@ -1,4 +1,4 @@
-*pi_paren.txt*  For Vim version 7.4b.  Last change: 2013 May 08
+*pi_paren.txt*  For Vim version 7.4.  Last change: 2013 May 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/pi_spec.txt
+++ b/runtime/doc/pi_spec.txt
@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.4b.  Last change: 2006 Apr 24
+*pi_spec.txt*   For Vim version 7.4.  Last change: 2006 Apr 24
 
 by Gustavo Niemeyer ~
 
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,4 +1,4 @@
-*pi_tar.txt*	For Vim version 7.4b.  Last change: 2013 Apr 17
+*pi_tar.txt*	For Vim version 7.4.  Last change: 2013 Apr 17
 
 		       +====================+
 		       | Tar File Interface |
--- a/runtime/doc/pi_vimball.txt
+++ b/runtime/doc/pi_vimball.txt
@@ -1,4 +1,4 @@
-*pi_vimball.txt*	For Vim version 7.4b.  Last change: 2012 Jan 17
+*pi_vimball.txt*	For Vim version 7.4.  Last change: 2012 Jan 17
 
 			       ----------------
 			       Vimball Archiver
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,4 +1,4 @@
-*pi_zip.txt*	For Vim version 7.4b.  Last change: 2013 Apr 17
+*pi_zip.txt*	For Vim version 7.4.  Last change: 2013 Apr 17
 
 				+====================+
 				| Zip File Interface |
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 7.4b.  Last change: 2010 Jul 20
+*print.txt*     For Vim version 7.4.  Last change: 2010 Jul 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.4b.  Last change: 2013 Aug 03
+*quickfix.txt*  For Vim version 7.4.  Last change: 2013 Aug 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.4b.  Last change: 2013 Jun 29
+*quickref.txt*  For Vim version 7.4.  Last change: 2013 Jun 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/quotes.txt
+++ b/runtime/doc/quotes.txt
@@ -1,4 +1,4 @@
-*quotes.txt*    For Vim version 7.4b.  Last change: 2010 Nov 03
+*quotes.txt*    For Vim version 7.4.  Last change: 2010 Nov 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 7.4b.  Last change: 2010 Jul 20
+*recover.txt*   For Vim version 7.4.  Last change: 2010 Jul 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 7.4b.  Last change: 2008 May 24
+*remote.txt*    For Vim version 7.4.  Last change: 2008 May 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.4b.  Last change: 2013 Jul 25
+*repeat.txt*    For Vim version 7.4.  Last change: 2013 Jul 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/rileft.txt
+++ b/runtime/doc/rileft.txt
@@ -1,4 +1,4 @@
-*rileft.txt*    For Vim version 7.4b.  Last change: 2006 Apr 24
+*rileft.txt*    For Vim version 7.4.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Avner Lottem
--- a/runtime/doc/russian.txt
+++ b/runtime/doc/russian.txt
@@ -1,4 +1,4 @@
-*russian.txt*   For Vim version 7.4b.  Last change: 2006 Apr 24
+*russian.txt*   For Vim version 7.4.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Vassily Ragosin
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -1,4 +1,4 @@
-*scroll.txt*    For Vim version 7.4b.  Last change: 2006 Aug 27
+*scroll.txt*    For Vim version 7.4.  Last change: 2006 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 7.4b.  Last change: 2012 Jul 10
+*sign.txt*      For Vim version 7.4.  Last change: 2012 Jul 10
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.4b.  Last change: 2013 Jul 17
+*spell.txt*	For Vim version 7.4.  Last change: 2013 Jul 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
--- a/runtime/doc/sponsor.txt
+++ b/runtime/doc/sponsor.txt
@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 7.4b.  Last change: 2008 Jun 21
+*sponsor.txt*   For Vim version 7.4.  Last change: 2008 Jun 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.4b.  Last change: 2013 Jul 20
+*starting.txt*  For Vim version 7.4.  Last change: 2013 Jul 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.4b.  Last change: 2013 Jul 05
+*syntax.txt*	For Vim version 7.4.  Last change: 2013 Jul 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 7.4b.  Last change: 2012 Aug 08
+*tabpage.txt*   For Vim version 7.4.  Last change: 2012 Aug 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 7.4b.  Last change: 2013 Jul 28
+*tagsrch.txt*   For Vim version 7.4.  Last change: 2013 Jul 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.4b.  Last change: 2013 Mar 13
+*term.txt*      For Vim version 7.4.  Last change: 2013 Mar 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 7.4b.  Last change: 2009 Nov 07
+*tips.txt*      For Vim version 7.4.  Last change: 2009 Nov 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4b.  Last change: 2013 Aug 03
+*todo.txt*      For Vim version 7.4.  Last change: 2013 Aug 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,8 +34,6 @@ not be repeated below, unless there is e
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-PHP indent script. (John Wellesz, Aug 2)
-
 Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
 
 Patch to add "acl" and "xpm" as a feature. (Ken Takata, 2013 Jul 8)
@@ -48,14 +46,18 @@ highlight group.  Add a "\zs" after it?
 
 Go through more coverity reports.
 
-Bug: ":he \^x" gives strange E63 error when 'regexpengine' is set to 1.
-With 'regexpengine' set to 0 results in an INTERNAL errror.
-(glts, 2013 Jul 28)
+"gUgn" cannot be repeated, while "dgn" can.
+
+Several Win32 functions are not using Unicode.
+Patches to fix this. (Ken Takata, 2013 Aug 9)
 
 /[b-a] gives error E16, should probably be E769.
 
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
+Patch to make external commands work with multi-byte characters on Win32 when
+'encoding' differs from the active codepage. (Yasuhiro Matsumoto, 2013 Aug 5)
+
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
 Fold can't be opened after ":move". (Ein Brown)
@@ -4113,6 +4115,8 @@ 7   Add Cmdline-select mode.  Like Selec
 
 
 Visual mode:
+8   Support using "." in Visual mode. Use the operator applied to the Visual
+    selection, if possible.
 -   When dragging the Visual selection with the mouse and 'scrolloff' is zero,
     behave like 'scrolloff' is one, so that the text scrolls when the pointer
     is in the top line.
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 7.4b.  Last change: 2013 Jul 06
+*uganda.txt*    For Vim version 7.4.  Last change: 2013 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.4b.  Last change: 2012 Mar 04
+*undo.txt*      For Vim version 7.4.  Last change: 2012 Mar 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -1,4 +1,4 @@
-*usr_01.txt*	For Vim version 7.4b.  Last change: 2010 Nov 03
+*usr_01.txt*	For Vim version 7.4.  Last change: 2010 Nov 03
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.4b.  Last change: 2010 Jul 20
+*usr_02.txt*	For Vim version 7.4.  Last change: 2010 Jul 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 7.4b.  Last change: 2006 Jun 21
+*usr_03.txt*	For Vim version 7.4.  Last change: 2006 Jun 21
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_04.txt
+++ b/runtime/doc/usr_04.txt
@@ -1,4 +1,4 @@
-*usr_04.txt*	For Vim version 7.4b.  Last change: 2008 Sep 06
+*usr_04.txt*	For Vim version 7.4.  Last change: 2008 Sep 06
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.4b.  Last change: 2012 Nov 20
+*usr_05.txt*	For Vim version 7.4.  Last change: 2012 Nov 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_06.txt
+++ b/runtime/doc/usr_06.txt
@@ -1,4 +1,4 @@
-*usr_06.txt*	For Vim version 7.4b.  Last change: 2009 Oct 28
+*usr_06.txt*	For Vim version 7.4.  Last change: 2009 Oct 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_07.txt
+++ b/runtime/doc/usr_07.txt
@@ -1,4 +1,4 @@
-*usr_07.txt*	For Vim version 7.4b.  Last change: 2006 Apr 24
+*usr_07.txt*	For Vim version 7.4.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 7.4b.  Last change: 2006 Jul 18
+*usr_08.txt*	For Vim version 7.4.  Last change: 2006 Jul 18
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -1,4 +1,4 @@
-*usr_09.txt*	For Vim version 7.4b.  Last change: 2006 Apr 24
+*usr_09.txt*	For Vim version 7.4.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 7.4b.  Last change: 2006 Nov 05
+*usr_10.txt*	For Vim version 7.4.  Last change: 2006 Nov 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -1,4 +1,4 @@
-*usr_11.txt*	For Vim version 7.4b.  Last change: 2010 Jul 20
+*usr_11.txt*	For Vim version 7.4.  Last change: 2010 Jul 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -1,4 +1,4 @@
-*usr_12.txt*	For Vim version 7.4b.  Last change: 2007 May 11
+*usr_12.txt*	For Vim version 7.4.  Last change: 2007 May 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_20.txt
+++ b/runtime/doc/usr_20.txt
@@ -1,4 +1,4 @@
-*usr_20.txt*	For Vim version 7.4b.  Last change: 2006 Apr 24
+*usr_20.txt*	For Vim version 7.4.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -1,4 +1,4 @@
-*usr_21.txt*	For Vim version 7.4b.  Last change: 2012 Nov 02
+*usr_21.txt*	For Vim version 7.4.  Last change: 2012 Nov 02
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -1,4 +1,4 @@
-*usr_22.txt*	For Vim version 7.4b.  Last change: 2012 Nov 15
+*usr_22.txt*	For Vim version 7.4.  Last change: 2012 Nov 15
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_23.txt
+++ b/runtime/doc/usr_23.txt
@@ -1,4 +1,4 @@
-*usr_23.txt*	For Vim version 7.4b.  Last change: 2006 Apr 24
+*usr_23.txt*	For Vim version 7.4.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -1,4 +1,4 @@
-*usr_24.txt*	For Vim version 7.4b.  Last change: 2006 Jul 23
+*usr_24.txt*	For Vim version 7.4.  Last change: 2006 Jul 23
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.4b.  Last change: 2007 May 11
+*usr_25.txt*	For Vim version 7.4.  Last change: 2007 May 11
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_26.txt
+++ b/runtime/doc/usr_26.txt
@@ -1,4 +1,4 @@
-*usr_26.txt*	For Vim version 7.4b.  Last change: 2006 Apr 24
+*usr_26.txt*	For Vim version 7.4.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_27.txt
+++ b/runtime/doc/usr_27.txt
@@ -1,4 +1,4 @@
-*usr_27.txt*	For Vim version 7.4b.  Last change: 2010 Mar 28
+*usr_27.txt*	For Vim version 7.4.  Last change: 2010 Mar 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_28.txt
+++ b/runtime/doc/usr_28.txt
@@ -1,4 +1,4 @@
-*usr_28.txt*	For Vim version 7.4b.  Last change: 2008 Jun 14
+*usr_28.txt*	For Vim version 7.4.  Last change: 2008 Jun 14
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -1,4 +1,4 @@
-*usr_29.txt*	For Vim version 7.4b.  Last change: 2008 Jun 28
+*usr_29.txt*	For Vim version 7.4.  Last change: 2008 Jun 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_30.txt
+++ b/runtime/doc/usr_30.txt
@@ -1,4 +1,4 @@
-*usr_30.txt*	For Vim version 7.4b.  Last change: 2007 Nov 10
+*usr_30.txt*	For Vim version 7.4.  Last change: 2007 Nov 10
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -1,4 +1,4 @@
-*usr_31.txt*	For Vim version 7.4b.  Last change: 2007 May 08
+*usr_31.txt*	For Vim version 7.4.  Last change: 2007 May 08
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_32.txt
+++ b/runtime/doc/usr_32.txt
@@ -1,4 +1,4 @@
-*usr_32.txt*	For Vim version 7.4b.  Last change: 2010 Jul 20
+*usr_32.txt*	For Vim version 7.4.  Last change: 2010 Jul 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -1,4 +1,4 @@
-*usr_40.txt*	For Vim version 7.4b.  Last change: 2006 Jun 21
+*usr_40.txt*	For Vim version 7.4.  Last change: 2013 Aug 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -440,16 +440,16 @@ written.  First you define a function: >
 	:  read !date
 	:endfunction
 
-You want this function to be called each time, just before a file is written.
-This will make that happen: >
+You want this function to be called each time, just before a buffer is written
+to a file.  This will make that happen: >
 
-	:autocmd FileWritePre *  call DateInsert()
+	:autocmd BufWritePre *  call DateInsert()
 
-"FileWritePre" is the event for which this autocommand is triggered: Just
-before (pre) writing a file.  The "*" is a pattern to match with the file
-name.  In this case it matches all files.
+"BufWritePre" is the event for which this autocommand is triggered: Just
+before (pre) writing a buffer to a file.  The "*" is a pattern to match with
+the file name.  In this case it matches all files.
    With this command enabled, when you do a ":write", Vim checks for any
-matching FileWritePre autocommands and executes them, and then it
+matching BufWritePre autocommands and executes them, and then it
 performs the ":write".
    The general form of the :autocmd command is as follows: >
 
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.4b.  Last change: 2013 Feb 20
+*usr_41.txt*	For Vim version 7.4.  Last change: 2013 Feb 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_42.txt
+++ b/runtime/doc/usr_42.txt
@@ -1,4 +1,4 @@
-*usr_42.txt*	For Vim version 7.4b.  Last change: 2008 May 05
+*usr_42.txt*	For Vim version 7.4.  Last change: 2008 May 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -1,4 +1,4 @@
-*usr_43.txt*	For Vim version 7.4b.  Last change: 2008 Dec 28
+*usr_43.txt*	For Vim version 7.4.  Last change: 2008 Dec 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -1,4 +1,4 @@
-*usr_44.txt*	For Vim version 7.4b.  Last change: 2008 Dec 28
+*usr_44.txt*	For Vim version 7.4.  Last change: 2008 Dec 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -1,4 +1,4 @@
-*usr_45.txt*	For Vim version 7.4b.  Last change: 2008 Nov 15
+*usr_45.txt*	For Vim version 7.4.  Last change: 2008 Nov 15
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -1,4 +1,4 @@
-*usr_90.txt*	For Vim version 7.4b.  Last change: 2008 Sep 10
+*usr_90.txt*	For Vim version 7.4.  Last change: 2008 Sep 10
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -1,4 +1,4 @@
-*usr_toc.txt*	For Vim version 7.4b.  Last change: 2010 Jul 20
+*usr_toc.txt*	For Vim version 7.4.  Last change: 2010 Jul 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.4b.  Last change: 2013 May 18
+*various.txt*   For Vim version 7.4.  Last change: 2013 May 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/version4.txt
+++ b/runtime/doc/version4.txt
@@ -1,4 +1,4 @@
-*version4.txt*  For Vim version 7.4b.  Last change: 2006 Apr 24
+*version4.txt*  For Vim version 7.4.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/version5.txt
+++ b/runtime/doc/version5.txt
@@ -1,4 +1,4 @@
-*version5.txt*  For Vim version 7.4b.  Last change: 2012 Aug 08
+*version5.txt*  For Vim version 7.4.  Last change: 2012 Aug 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -1,4 +1,4 @@
-*version6.txt*  For Vim version 7.4b.  Last change: 2013 Jul 28
+*version6.txt*  For Vim version 7.4.  Last change: 2013 Jul 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.4b.  Last change: 2013 Aug 02
+*version7.txt*  For Vim version 7.4.  Last change: 2013 Aug 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -18188,5 +18188,123 @@ Problem:    Some comments are not so nic
 Solution:   Change the comments.
 Files:	    src/ex_docmd.c, src/message.c, src/ops.c, src/option.c
 
+Patch 7.4b.001
+Problem:    Win32: dialog may extend off-screen.
+Solution:   Reduce the size, use correct borders. (Andrei Olsen)
+Files:	    src/gui_w32.c
+
+Patch 7.4b.002
+Problem:    Crash searching for \%(\%(\|\d\|-\|\.\)*\|\*\). (Marcin
+	    Szamotulski)  Also for \(\)*.
+Solution:   Do add a state for opening parenthesis, so that we can check if it
+	    was added before at the same position.
+Files:	    src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok
+
+Patch 7.4b.003
+Problem:    Regexp code is not nicely aligned.
+Solution:   Adjust white space. (Ken Takata)
+Files:	    src/regexp_nfa.c
+
+Patch 7.4b.004
+Problem:    Regexp crash on pattern "@\%[\w\-]*". (Axel Kielhorn)
+Solution:   Add \%(\) around \%[] internally.
+Files:	    src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok
+
+Patch 7.4b.005
+Problem:    Finding %s in shellpipe and shellredir does not ignore %%s.
+Solution:   Skip over %%. (lcd 47)
+Files:	    src/ex_cmds.c
+
+Patch 7.4b.006 (after 7.3.1295)
+Problem:    Using \{n,m} in an autocommand pattern no longer works.
+	    Specifically, mutt temp files are not recognized. (Gary Johnson)
+Solution:   Make \\\{n,m\} work.
+Files:	    runtime/doc/autocmd.txt, src/fileio.c
+
+Patch 7.4b.007
+Problem:    On 32 bit MS-Windows :perldo does not work.
+Solution:   Make sure time_t uses 32 bits. (Ken Takata)
+Files:	    src/if_perl.xs, src/vim.h
+
+Patch 7.4b.008
+Problem:    'autochdir' causes setbufvar() to change the current directory.
+	    (Ben Fritz)
+Solution:   When disabling autocommands also reset 'acd' temporarily.
+	    (Christian Brabandt)
+Files:	    src/fileio.c
+
+Patch 7.4b.009
+Problem:    When setting the Visual area manually and 'selection' is
+	    exclusive, a yank includes one character too much. (Ingo Karkat)
+Solution:   Default the Visual operation to "v". (Christian Brabandt)
+Files:	    src/mark.c
+
+Patch 7.4b.010
+Problem:    Win32: Tcl library load does not use standard mechanism.
+Solution:   Call vimLoadLib() instead of LoadLibraryEx(). (Ken Takata)
+Files:	    src/if_perl.xs, src/if_tcl.c
+
+Patch 7.4b.011
+Problem:    ":he \%(\)" does not work. (ZyX)
+Solution:   Add an exception to the list.
+Files:	    src/ex_cmds.c
+
+Patch 7.4b.012
+Problem:    Output from a shell command is truncated at a NUL. (lcd 47)
+Solution:   Change every NUL into an SOH.
+Files:	    src/misc1.c
+
+Patch 7.4b.013
+Problem:    Install dir for JP man pages is wrong.
+Solution:   Remove ".UTF-8" from the directory name. (Ken Takata)
+Files:	    src/Makefile
+
+Patch 7.4b.014 (after 7.4b.012)
+Problem:    Stupid mistake.
+Solution:   Changle "len" to "i".
+Files:	    src/misc1.c
+
+Patch 7.4b.015 (after 7.4b.008)
+Problem:    Can't compile without the 'acd' feature.
+Solution:   Add #ifdefs. (Kazunobu Kuriyama)
+Files:	    src/fileio.c
+
+Patch 7.4b.016
+Problem:    Ruby detection fails on Fedora 19.
+Solution:   Use one way to get the Ruby version. (Michael Henry)
+Files:	    src/configure.in, src/auto/configure
+
+Patch 7.4b.017
+Problem:    ":he \^x" gives a strange error message. (glts)
+Solution:   Do not translate \^x to \_CTRL-x.
+Files:	    src/ex_cmds.c
+
+Patch 7.4b.018 (after 7.4b.001)
+Problem:    Win32: Dialog can still be too big.
+Solution:   Move the check for height further down. (Andrei Olsen)
+Files:	    src/gui_w32.c
+
+Patch 7.4b.019 (after 7.4a.034)
+Problem:    Tabline is not updated properly when closing a tab on Win32.
+Solution:   Only reduce flickering when adding a tab. (Ken Takata)
+Files:	    src/gui_w48.c
+
+Patch 7.4b.020
+Problem:    "g~ap" changes first character of next paragraph. (Manuel Ortega)
+Solution:   Avoid subtracting (0 - 1) from todo.  (Mike Williams)
+Files:	    src/ops.c, src/testdir/test82.in, src/testdir/test82.ok
+
+Patch 7.4b.021
+Problem:    Pressing "u" after an external command results in multiple
+	    press-enter messages. (glts)
+Solution:   Don't call hit_return_msg() when we have K_IGNORE. (Christian
+	    Brabandt)
+Files:	    src/message.c
+
+Patch 7.4b.022
+Problem:    Not waiting for a character when the tick count overflows.
+Solution:   Subtract the unsigned numbers and cast to int. (Ken Takata)
+Files:	    src/os_win32.c
+
 
  vim:tw=78:ts=8:ft=help:norl:
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 7.4b.  Last change: 2012 Aug 08
+*vi_diff.txt*   For Vim version 7.4.  Last change: 2012 Aug 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 7.4b.  Last change: 2012 Aug 15
+*visual.txt*    For Vim version 7.4.  Last change: 2012 Aug 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 7.4b.  Last change: 2012 Nov 15
+*windows.txt*   For Vim version 7.4.  Last change: 2012 Nov 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/workshop.txt
+++ b/runtime/doc/workshop.txt
@@ -1,4 +1,4 @@
-*workshop.txt*  For Vim version 7.4b.  Last change: 2013 Jul 06
+*workshop.txt*  For Vim version 7.4.  Last change: 2013 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -3,8 +3,8 @@
 " Author:	John Wellesz <John.wellesz (AT) teaser (DOT) fr>
 " URL:		http://www.2072productions.com/vim/indent/php.vim
 " Home:		https://github.com/2072/PHP-Indenting-for-VIm
-" Last Change:	2013 August 2nd
-" Version:	1.38
+" Last Change:	2013 August 7th
+" Version:	1.39
 "
 "
 "	Type :help php-indent for available options
@@ -303,7 +303,7 @@ function! FindTheSwitchIndent (lnum) " {
 
 endfunction "}}}
 
-let s:SynPHPMatchGroups = {'phpParent':1, 'Delimiter':1, 'Define':1, 'Storageclass':1, 'Structure':1, 'Exception':1}
+let s:SynPHPMatchGroups = {'phpParent':1, 'Delimiter':1, 'Define':1, 'Storageclass':1, 'StorageClass':1, 'Structure':1, 'Exception':1}
 function! IslinePHP (lnum, tofind) " {{{
     let cline = getline(a:lnum)
 
--- a/src/GvimExt/GvimExt.reg
+++ b/src/GvimExt/GvimExt.reg
@@ -15,6 +15,6 @@ REGEDIT4
 [HKEY_LOCAL_MACHINE\Software\Vim\Gvim]
    "path"="gvim.exe"
 
-[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.4b]
-   "DisplayName"="Vim 7.4b: Edit with Vim popup menu entry"
+[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.4]
+   "DisplayName"="Vim 7.4: Edit with Vim popup menu entry"
    "UninstallString"="uninstal.exe"
--- a/src/Makefile
+++ b/src/Makefile
@@ -949,7 +949,7 @@ MAN1DIR = /man1
 
 ### Vim version (adjusted by a script)
 VIMMAJOR = 7
-VIMMINOR = 4b
+VIMMINOR = 4
 
 ### Location of Vim files (should not need to be changed, and  {{{1
 ### some things might not work when they are changed!)
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -129,6 +129,7 @@ typedef void *HDC;
 typedef void VOID;
 typedef int LPNMHDR;
 typedef int LONG;
+typedef int WNDPROC;
 #endif
 
 #ifndef GET_X_LPARAM
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 7.3\n"
+"Project-Id-Version: vim 7.4b\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-10 11:10+0100\n"
-"PO-Revision-Date:  2011-03-12 07:08+0100\n"
+"POT-Creation-Date: 2013-07-29 16:11+0200\n"
+"PO-Revision-Date:  2013-08-03 17:14+0200\n"
 "Last-Translator:   Vlad Sandrini   <vlad.gently@gmail.com>\n"
 "Language-Team:     Italian"
 "                   Antonio Colombo <azc100@gmail.com>"
@@ -45,6 +45,9 @@ msgstr "[Lista Locazioni]"
 msgid "[Quickfix List]"
 msgstr "[Lista Quickfix]"
 
+msgid "E855: Autocommands caused command to abort"
+msgstr "E855: Comando non completato a causa di autocomandi"
+
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Non riesco ad allocare alcun buffer, esco..."
 
@@ -140,18 +143,18 @@ msgstr "[File nuovo]"
 msgid "[Read errors]"
 msgstr "[Errori in lettura]"
 
+msgid "[RO]"
+msgstr "[Sola Lettura]"
+
 msgid "[readonly]"
 msgstr "[in sola lettura]"
 
-#, c-format
 msgid "1 line --%d%%--"
 msgstr "1 linea --%d%%--"
 
-#, c-format
 msgid "%ld lines --%d%%--"
 msgstr "%ld linee --%d%%--"
 
-#, c-format
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "linea %ld di %ld --%d%%-- col "
 
@@ -177,7 +180,6 @@ msgstr "Fon"
 msgid "Top"
 msgstr "Cim"
 
-#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -423,6 +425,10 @@ msgstr "E130: Funzione sconosciuta: %s"
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nome di variabile non ammesso: %s"
 
+# nuovo
+msgid "E806: using Float as a String"
+msgstr "E806: uso di un numero con virgola come stringa"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: Destinazioni più numerose degli elementi di Lista"
 
@@ -565,6 +571,9 @@ msgstr "E725: Chiamata di funzione dict 
 msgid "E808: Number or Float required"
 msgstr "E808: Ci vuole un numero intero o con virgola"
 
+msgid "add() argument"
+msgstr "argomento di add()"
+
 msgid "E699: Too many arguments"
 msgstr "E699: Troppi argomenti"
 
@@ -583,6 +592,15 @@ msgstr "&OK"
 msgid "E737: Key already exists: %s"
 msgstr "E737: Chiave già esistente: %s"
 
+msgid "extend() argument"
+msgstr "argomento di extend()"
+
+msgid "map() argument"
+msgstr "argomento di map()"
+
+msgid "filter() argument"
+msgstr "argomento di filter()"
+
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld linee: "
@@ -601,6 +619,9 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() chiamata più volte di inputsave()"
 
+msgid "insert() argument"
+msgstr "argomento di insert()"
+
 msgid "E786: Range not allowed"
 msgstr "E786: Intervallo non consentito"
 
@@ -626,12 +647,21 @@ msgstr "E241: Impossibile inviare a %s"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: Non riesco a leggere una risposta del server"
 
+msgid "remove() argument"
+msgstr "argomento di remove()"
+
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Troppi link simbolici (circolarità?)"
 
+msgid "reverse() argument"
+msgstr "argomento di reverse()"
+
 msgid "E258: Unable to send to client"
 msgstr "E258: Impossibile inviare al client"
 
+msgid "sort() argument"
+msgstr "argomento di sort()"
+
 msgid "E702: Sort compare function failed"
 msgstr "E702: Funzione confronto nel sort non riuscita"
 
@@ -662,8 +692,13 @@ msgstr "E730: uso di Lista come Stringa"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: uso di Dizionario come Stringa"
 
-msgid "E806: using Float as a String"
-msgstr "E806: uso di un numero con virgola come stringa"
+#, c-format
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: Tipo di variabile non corrispondente per: %s"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: Non posso cancellare la variabile %s"
 
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
@@ -675,14 +710,6 @@ msgid "E705: Variable name conflicts wit
 msgstr "E705: Nome di variabile in conflitto con una funzione esistente: %s"
 
 #, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Tipo di variabile non corrispondente per: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Non posso cancellare la variabile %s"
-
-#, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: Valore di %s non modificabile"
 
@@ -704,10 +731,17 @@ msgstr "E123: Funzione non definita: %s"
 msgid "E124: Missing '(': %s"
 msgstr "E124: Manca '(': %s"
 
+msgid "E862: Cannot use g: here"
+msgstr "E862: Non si può usare g: qui"
+
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Argomento non ammesso: %s"
 
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Nome argomento duplicato: %s"
+
 msgid "E126: Missing :endfunction"
 msgstr "E126: Manca :endfunction"
 
@@ -852,7 +886,6 @@ msgstr "Scrivo file viminfo \"%s\""
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Questo file viminfo è stato generato da Vim %s.\n"
 
-#, c-format
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -860,7 +893,6 @@ msgstr ""
 "# File modificabile, attento a quel che fai!\n"
 "\n"
 
-#, c-format
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# Valore di 'encoding' al momento della scrittura di questo file\n"
 
@@ -973,6 +1005,9 @@ msgid "Pattern found in every line: %s"
 msgstr "Espressione trovata su ogni linea: %s"
 
 #, c-format
+msgid "Pattern not found: %s"
+msgstr "Espressione non trovata: %s"
+
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1301,8 +1336,8 @@ msgid "unknown"
 msgstr "sconosciuto"
 
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: Non riesco a trovare schema colore %s"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: Non riesco a trovare schema colore '%s'"
 
 msgid "Greetings, Vim user!"
 msgstr "Salve, utente Vim!"
@@ -1623,9 +1658,6 @@ msgstr "[socket]"
 msgid "[character special]"
 msgstr "[character special]"
 
-msgid "[RO]"
-msgstr "[Sola Lettura]"
-
 msgid "[CR missing]"
 msgstr "[manca CR]"
 
@@ -2022,6 +2054,12 @@ msgstr "Non trovo il mapping"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: modo non consentito"
 
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: Creazione di un nuovo processo fallita per la GUI"
+
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: Il processo figlio non è riuscito a far partire la GUI"
+
 msgid "E229: Cannot start the GUI"
 msgstr "E229: Non posso inizializzare la GUI"
 
@@ -2230,32 +2268,28 @@ msgid "Font '%s' is not fixed-width"
 msgstr "Il font '%s' non di larghezza fissa"
 
 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: Nome fontset: %s\n"
-
-#, c-format
-msgid "Font0: %s\n"
-msgstr "Font0: %s\n"
-
-#, c-format
-msgid "Font1: %s\n"
-msgstr "Font1: %s\n"
-
-#, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "La larghezza di font%ld non è doppia di quella di font0\n"
-
-#, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Larghezza di Font0: %ld\n"
-
-#, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"Larghezza di Font1: %ld\n"
-"\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: Nome fontset: %s"
+
+#, c-format
+msgid "Font0: %s"
+msgstr "Font0: %s"
+
+#, c-format
+msgid "Font1: %s"
+msgstr "Font1: %s"
+
+#, c-format
+msgid "Font%ld width is not twice that of font0"
+msgstr "La larghezza di font%ld non è doppia di quella di font0"
+
+#, c-format
+msgid "Font0 width: %ld"
+msgstr "Larghezza di Font0: %ld"
+
+#, c-format
+msgid "Font1 width: %ld"
+msgstr "Larghezza di Font1: %ld"
 
 msgid "Invalid font specification"
 msgstr "Specifica di font non valida"
@@ -2442,6 +2476,9 @@ msgstr "E566: Non riesco a creare pipes 
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Non riesco a fare fork per cscope"
 
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection setpgid fallita"
+
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection exec fallita"
 
@@ -2585,6 +2622,9 @@ msgstr "non posso inserire la linea"
 msgid "string cannot contain newlines"
 msgstr "la stringa non può contenere caratteri 'A CAPO'"
 
+msgid "error converting Scheme values to Vim"
+msgstr "errore nel convertire i valori Scheme a Vim"
+
 msgid "Vim error: ~a"
 msgstr "Errore Vim: ~a"
 
@@ -2619,55 +2659,12 @@ msgstr ""
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python non può essere chiamato ricorsivamente"
 
-msgid "can't delete OutputObject attributes"
-msgstr "non riesco a cancellare gli attributi OutputObject"
-
-msgid "softspace must be an integer"
-msgstr "softspace deve essere un numero intero"
-
-msgid "invalid attribute"
-msgstr "attributo non valido"
-
-msgid "attempt to refer to deleted buffer"
-msgstr "tentativo di referenza a buffer cancellato"
-
 msgid "line number out of range"
 msgstr "numero linea non nell'intervallo"
 
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<buffer oggetto (cancellato) a %p>"
-
 msgid "invalid mark name"
 msgstr "nome di mark non valido"
 
-msgid "no such buffer"
-msgstr "buffer inesistente"
-
-msgid "attempt to refer to deleted window"
-msgstr "tentativo di referenza a una finestra cancellata"
-
-msgid "readonly attribute"
-msgstr "attributo 'readonly'"
-
-msgid "cursor position outside buffer"
-msgstr "posizione cursore fuori dal buffer"
-
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<finestra oggetto (cancellata) a %p>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<finestra oggetto (sconosciuta) a %p>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<finestra %d>"
-
-msgid "no such window"
-msgstr "finestra inesistente"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ deve essere un'istanza di String"
 
@@ -2839,7 +2836,7 @@ msgstr ""
 
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
-"non posso registrare comando callback: referenza a buffer/finestra "
+"non posso registrare comando callback: riferimento a buffer/finestra "
 "inesistente"
 
 msgid ""
@@ -2848,12 +2845,6 @@ msgstr ""
 "E571: Spiacente, comando non disponibile, non riesco a caricare libreria "
 "programmi Tcl."
 
-msgid ""
-"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr ""
-"E281: ERRORE TCL: codice di ritorno non int!? Si prega notificare a vim-"
-"dev@vim.org"
-
 #, c-format
 msgid "E572: exit code %d"
 msgstr "E572: codice di uscita %d"
@@ -3009,6 +3000,9 @@ msgstr "-v\t\t\tModalità Vi (come \"vi\")"
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tModalità Ex (come \"ex\")"
 
+msgid "-E\t\t\tImproved Ex mode"
+msgstr "-E\t\t\tModalità Ex migliorata"
+
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\tModalità Silenziosa (batch) (solo per \"ex\")"
 
@@ -3245,19 +3239,6 @@ msgstr "-xrm <risorsa>\tImposta la risor
 
 msgid ""
 "\n"
-"Arguments recognised by gvim (RISC OS version):\n"
-msgstr ""
-"\n"
-"Argomenti accettati da gvim (versione RISC OS):\n"
-
-msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <numero>\tLarghezza iniziale finestra in colonne"
-
-msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <numero>\tAltezza iniziale finestra in righe"
-
-msgid ""
-"\n"
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
@@ -3274,6 +3255,9 @@ msgstr ""
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\tApri Vim dentro un altro widget GTK"
 
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tStampa il Window ID su stdout"
+
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <titolo padre>\tApri Vim in un'applicazione padre"
 
@@ -3332,7 +3316,6 @@ msgstr ""
 "\n"
 "modif linea  col testo"
 
-#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3341,7 +3324,6 @@ msgstr ""
 "# File mark:\n"
 
 #. Write the jumplist with -'
-#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3349,7 +3331,6 @@ msgstr ""
 "\n"
 "# Jumplist (dai più recenti):\n"
 
-#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -4072,6 +4053,9 @@ msgstr "Ribatti per conferma la stessa c
 msgid "Keys don't match!"
 msgstr "Le chiavi non corrispondono!"
 
+msgid "E854: path too long for completion"
+msgstr "E854: percorso troppo lungo per il completamento"
+
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4120,8 +4104,9 @@ msgstr "E838: netbeans non è supportato con questa GUI"
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans già connesso"
 
-msgid "E505: "
-msgstr "E505: "
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s è in sola lettura (aggiungi ! per eseguire comunque)"
 
 msgid "E349: No identifier under cursor"
 msgstr "E349: Nessun identificativo sotto il cursore"
@@ -4285,6 +4270,9 @@ msgstr "E519: Opzione non supportata"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Non consentito in una 'modeline'"
 
+msgid "E846: Key code not set"
+msgstr "E846: Key code non impostato"
+
 msgid "E521: Number required after ="
 msgstr "E521: Ci vuole un numero dopo ="
 
@@ -4731,6 +4719,33 @@ msgstr "E681: Buffer non caricato"
 msgid "E777: String or List expected"
 msgstr "E777: aspettavo Stringa o Lista"
 
+#, c-format
+msgid "E769: Missing ] after %s["
+msgstr "E769: Manca ] dopo %s["
+
+msgid "E53: Unmatched %s%%("
+msgstr "E53: Senza riscontro: %s%%("
+
+#, c-format
+msgid "E54: Unmatched %s("
+msgstr "E54: Senza riscontro: %s("
+
+#, c-format
+msgid "E55: Unmatched %s)"
+msgstr "E55: Senza riscontro: %s)"
+
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z( non consentito qui"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 ecc. non consentiti qui"
+
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: Manca ] dopo %s%%["
+
+msgid "E70: Empty %s%%[]"
+msgstr "E70: %s%%[] vuoto"
+
 msgid "E339: Pattern too long"
 msgstr "E339: Espressione troppo lunga"
 
@@ -4744,17 +4759,6 @@ msgstr "E51: Troppe %s("
 msgid "E52: Unmatched \\z("
 msgstr "E52: Senza riscontro: \\z("
 
-msgid "E53: Unmatched %s%%("
-msgstr "E53: Senza riscontro: %s%%("
-
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: Senza riscontro: %s("
-
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: Senza riscontro: %s)"
-
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: Carattere non ammesso dopo %s@"
@@ -4781,21 +4785,9 @@ msgstr "E64: %s%c senza nulla prima"
 msgid "E65: Illegal back reference"
 msgstr "E65: Riferimento all'indietro non ammesso"
 
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( non consentito qui"
-
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 ecc. non consentiti qui"
-
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Carattere non ammesso dopo \\z"
 
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: Manca ] dopo %s%%["
-
-msgid "E70: Empty %s%%[]"
-msgstr "E70: %s%%[] vuoto"
-
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Carattere non valido dopo %s%%[dxouU]"
 
@@ -4803,16 +4795,84 @@ msgid "E71: Invalid character after %s%%
 msgstr "E71: Carattere non ammesso dopo %s%%"
 
 #, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: Manca ] dopo %s["
-
-#, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Errore sintattico in %s{...}"
 
 msgid "External submatches:\n"
 msgstr "Sotto-corrispondenze esterne:\n"
 
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= può essere seguito solo da 0, 1 o 2. Sarà usato il motore automatico "
+
+#, c-format
+msgid "E866: (NFA regexp) Misplaced %c"
+msgstr "E866: (NFA regexp) %c fuori posto"
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (NFA) Fine prematura dell'espressione regolare"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (NFA) Operatore sconosciuto '\\z%c'"
+
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) Operatore sconosciuto '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Errore nel build di NFA con classe di equivalenza!"
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (NFA) Operatore sconosciuto '\\@%c'"
+
+msgid "E870: (NFA regexp) Error reading repetition limits"
+msgstr "E870: (NFA regexp) Errore nella lettura dei limiti di ripetizione"
+
+#. Can't have a multi follow a multi.
+msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+msgstr "E871: (NFA regexp) Non si può avere multi dopo multi !"
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (NFA regexp) Troppi '('"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA regexp) Troppi \\z("
+
+msgid "E873: (NFA regexp) proper termination error"
+msgstr "E873: (NFA regexp) errore di terminazione corretta"
+
+msgid "E874: (NFA) Could not pop the stack !"
+msgstr "E874: (NFA) Impossibile riprendere lo stack !"
+
+msgid ""
+"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+"left on stack"
+msgstr "E875: (NFA regexp) (Nella conversione da postfix a NFA), "
+"troppi stati lasciati sullo stack"
+
+msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+msgstr "E876: (NFA regexp) Non c'è spazio per immagazzinare l'intero NFA "
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) Non posso allocare memoria per il zigzag di ramo!"
+
+msgid ""
+"Could not open temporary log file for writing, displaying on stderr ... "
+msgstr ""
+"Non posso aprire il file temporaneo per la scrittura, mostro su stderr ... "
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) IMPOSSIBILE APRIRE %s !"
+
+msgid "Could not open temporary log file for writing "
+msgstr "Non posso aprire il log temporaneo in scrittura "
+
 msgid " VREPLACE"
 msgstr " V-SOSTITUISCI"
 
@@ -5195,7 +5255,6 @@ msgstr "%d parole con caratteri non-ASCI
 msgid "E845: Insufficient memory, word list will be incomplete"
 msgstr "E845: Memoria insufficiente, la lista parole sarà incompleta"
 
-#, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "%d di %d nodi compressi; ne restano %d (%d%%)"
 
@@ -5309,6 +5368,9 @@ msgstr "E782: Errore leggendo il file .s
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: carattere duplicato nell'elemento MAP"
 
+msgid "No Syntax items defined for this buffer"
+msgstr "Nessun elemento sintattico definito per questo buffer"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argomento non ammesso: %s"
@@ -5317,9 +5379,6 @@ msgstr "E390: Argomento non ammesso: %s"
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: 'cluster' sintattico inesistente: %s"
 
-msgid "No Syntax items defined for this buffer"
-msgstr "Nessun elemento sintattico definito per questo buffer"
-
 msgid "syncing on C-style comments"
 msgstr "sincronizzo i commenti nello stile C"
 
@@ -5385,6 +5444,9 @@ msgstr "E394: Elemento di 'region' non t
 msgid "E397: Filename required"
 msgstr "E397: Nome file necessario"
 
+msgid "E847: Too many syntax includes"
+msgstr "E847: Troppe inclusioni di sintassi"
+
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: Manca ']': %s"
@@ -5397,6 +5459,9 @@ msgstr "E398: Manca '=': %s"
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Argomenti non sufficienti per: 'syntax region' %s"
 
+msgid "E848: Too many syntax clusters"
+msgstr "E848: Troppi 'cluster' sintattici"
+
 msgid "E400: No cluster specified"
 msgstr "E400: Nessun 'cluster' specificato"
 
@@ -5440,6 +5505,11 @@ msgstr "E409: Nome gruppo sconosciuto: %
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Sotto-comando :syntax non valido: %s"
 
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTALE     CONT.  CORRIS. PIU LENTO   MEDIA     NOME               MODELLO"
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: ciclo ricorsivo nel caricamento di syncolor.vim"
 
@@ -5501,6 +5571,9 @@ msgstr "E669: Carattere non stampabile i
 msgid "W18: Invalid character in group name"
 msgstr "W18: Carattere non ammesso in un nome di gruppo"
 
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: Troppi gruppi di evidenziazione e sintassi"
+
 msgid "E555: at bottom of tag stack"
 msgstr "E555: al fondo dello stack dei tag"
 
@@ -5561,6 +5634,9 @@ msgstr "Ricerca nel tag file %s"
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Percorso tag file troncato per %s\n"
 
+msgid "Ignoring long line in tags file"
+msgstr "Linea lunga ignorata nel tag file"
+
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Errore di formato nel tag file \"%s\""
@@ -5577,9 +5653,6 @@ msgstr "E432: Tag file non ordinato alfa
 msgid "E433: No tags file"
 msgstr "E433: Nessun tag file"
 
-msgid "Ignoring long line in tags file"
-msgstr "Linea lunga ignorata nel tag file"
-
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Non riesco a trovare modello tag"
 
@@ -5853,13 +5926,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"RISC OS version"
-msgstr ""
-"\n"
-"Versione RISC OS"
-
-msgid ""
-"\n"
 "OpenVMS version"
 msgstr ""
 "\n"
@@ -6499,6 +6565,9 @@ msgstr "E139: File già caricato in un altro buffer"
 msgid "E764: Option '%s' is not set"
 msgstr "E764: opzione '%s' non impostata"
 
+msgid "E850: Invalid register name"
+msgstr "E850: Nome registro non valido"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "raggiunta la CIMA nella ricerca, continuo dal FONDO"
 
@@ -6509,8 +6578,226 @@ msgstr "raggiunto il FONDO nella ricerca
 msgid "Need encryption key for \"%s\""
 msgstr "Serve una chiave di cifratura per \"%s\""
 
-msgid "writelines() requires list of strings"
-msgstr "writelines() richiede una lista di stringhe"
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "attesa istanza di str() o unicode(), trovato invece %s"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "attesa istanza di bytes() o str(), trovato invece %s"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr ""
+"atteso int(), long() o qualcosa che supporti forzatura a long(), trovato invece %s"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "atteso int() o qualcosa che supporti forzatura a int(), trovato invece %s"
+
+msgid "value is too large to fit into C int type"
+msgstr "valore troppo grande per il tipo int del C"
+
+msgid "value is too small to fit into C int type"
+msgstr "valore troppo piccolo per il tipo int del C"
+
+msgid "number must be greater then zero"
+msgstr "il numero dev'essere maggiore di zero"
+
+msgid "number must be greater or equal to zero"
+msgstr "il numero dev'essere maggiore o uguale a zero"
+
+msgid "can't delete OutputObject attributes"
+msgstr "non riesco a cancellare gli attributi OutputObject"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "attributo non valido: %s"
 
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: Errore di inizializzazione oggetti I/O"
+
+msgid "failed to change directory"
+msgstr "cambio directory non riuscito"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "atteso terzetto come risultato di imp.find_module(), trovato invece %s"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "atteso terzetto come risultato di imp.find_module(), trovato invece tuple di dimens. %d"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "errore interno: imp.find_module restituisce tuple con NULL"
+
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "non riesco a cancellare gli attributi vim.Dictionary"
+
+msgid "cannot modify fixed dictionary"
+msgstr "non posso modificare il dizionario fisso"
+
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "non posso impostare attributo %s"
+
+msgid "hashtab changed during iteration"
+msgstr "hashtab cambiato durante l'iterazione"
+
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "atteso elemento sequenza di dimensione 2, trovata sequenza di dimensione %d"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "il costruttore di lista non accetta parole chiave come argomenti"
+
+msgid "list index out of range"
+msgstr "indice di lista non nell'intervallo"
+
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "errore interno: non ho potuto ottenere l'elemento di vim list %d"
+
+msgid "failed to add item to list"
+msgstr "non ho potuto aggiungere un elemento alla lista"
+
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "errore interno: non c'è un elemento di vim list %d"
+
+msgid "internal error: failed to add item to list"
+msgstr "errore interno: non ho potuto aggiungere un elemento alla lista"
+
+msgid "cannot delete vim.List attributes"
+msgstr "non riesco a cancellare gli attributi vim.List"
+
+msgid "cannot modify fixed list"
+msgstr "non posso modificare la lista fissa"
+
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "la funzione anonima %s non esiste"
+
+#, c-format
+msgid "function %s does not exist"
+msgstr "la funzione %s non esiste"
+
+msgid "function constructor does not accept keyword arguments"
+msgstr "il costruttore di funzione non accetta parole chiave come argomenti"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "esecuzione non riuscita della funzione %s"
+
+msgid "unable to get option value"
+msgstr "impossibile ottenere il valore di opzione"
+
+msgid "internal error: unknown option type"
+msgstr "errore interno: tipo di opzione sconosciuto"
+
+msgid "problem while switching windows"
+msgstr "problema nel cambio finestra"
+
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "impossibile deimpostare l'opzione globale %s"
+
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "impossibile deimpostare l'opzione %s che non ha un valore globale"
+
+msgid "attempt to refer to deleted tab page"
+msgstr "tentativo di riferimento a linguetta cancellata"
+
+msgid "no such tab page"
+msgstr "linguetta inesistente"
+
+msgid "attempt to refer to deleted window"
+msgstr "tentativo di riferimento a una finestra cancellata"
+
+msgid "readonly attribute: buffer"
+msgstr "attributo in sola lettura: buffer"
+
+msgid "cursor position outside buffer"
+msgstr "posizione cursore fuori dal buffer"
+
+msgid "no such window"
+msgstr "finestra inesistente"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "tentativo di riferimento a buffer cancellato"
+
+msgid "failed to rename buffer"
+msgstr "cambio nome buffer non riuscito"
+
+msgid "mark name must be a single character"
+msgstr "il nome mark dev'essere un carattere singolo"
+
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "atteso oggetto vim.Buffer, trovato %s"
+
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "passaggio non riuscito al buffer %d"
+
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "atteso oggetto vim.Window, trovato %s"
+
+msgid "failed to find window in the current tab page"
+msgstr "non è stato possibile trovare la finestra nella pagina con linguette corrente"
+
+msgid "did not switch to the specified window"
+msgstr "passaggio alla finestra specificata non effettuato"
+
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "atteso oggetto vim.TabPage, trovato %s"
+
+msgid "did not switch to the specified tab page"
+msgstr "passaggio alla linguetta specificata non effettuato"
+
+msgid "failed to run the code"
+msgstr "esecuzione del codice non riuscita"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval non ha restituito un oggetto python valido"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: Conversione non riuscita dell'oggetto python risultato a un valore vim"
+
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "impossibile convertire %s a dizionario vim"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "impossibile convertire %s a struttura vim"
+
+msgid "internal error: NULL reference passed"
+msgstr "errore interno: passato riferimento NULL"
+
+msgid "internal error: invalid value type"
+msgstr "errore interno: tipo di valore non valido"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Impostazione dell'ancora di percorso non riuscita: sys.path_hooks non è una lista\n"
+"Dovresti fare così:\n"
+"- aggiungere vim.path_hook a vim.path_hooks\n"
+"- aggiungere vim.VIM_SPECIAL_PATH a sys.path\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Impostazione di percorso non riuscita: sys.path non è una lista\n"
+"Dovresti aggiungere vim.VIM_SPECIAL_PATH a sys.path"
+
--- a/src/version.c
+++ b/src/version.c
@@ -728,50 +728,6 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
-    22,
-/**/
-    21,
-/**/
-    20,
-/**/
-    19,
-/**/
-    18,
-/**/
-    17,
-/**/
-    16,
-/**/
-    15,
-/**/
-    14,
-/**/
-    13,
-/**/
-    12,
-/**/
-    11,
-/**/
-    10,
-/**/
-    9,
-/**/
-    8,
-/**/
-    7,
-/**/
-    6,
-/**/
-    5,
-/**/
-    4,
-/**/
-    3,
-/**/
-    2,
-/**/
-    1,
-/**/
     0
 };
 
--- a/src/version.h
+++ b/src/version.h
@@ -19,13 +19,13 @@
 #define VIM_VERSION_MINOR_STR		"4"
 #define VIM_VERSION_100	    (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR)
 
-#define VIM_VERSION_BUILD		 279
-#define VIM_VERSION_BUILD_BCD		0x117
-#define VIM_VERSION_BUILD_STR		"279"
+#define VIM_VERSION_BUILD		 280
+#define VIM_VERSION_BUILD_BCD		0x118
+#define VIM_VERSION_BUILD_STR		"280"
 #define VIM_VERSION_PATCHLEVEL		 0
 #define VIM_VERSION_PATCHLEVEL_STR	"0"
 /* Used by MacOS port should be one of: development, alpha, beta, final */
-#define VIM_VERSION_RELEASE		beta
+#define VIM_VERSION_RELEASE		final
 
 /*
  * VIM_VERSION_NODOT is used for the runtime directory name.
@@ -33,8 +33,8 @@
  * VIM_VERSION_MEDIUM is used for the startup-screen.
  * VIM_VERSION_LONG is used for the ":version" command and "Vim -h".
  */
-#define VIM_VERSION_NODOT	"vim74b"
-#define VIM_VERSION_SHORT	"7.4b"
-#define VIM_VERSION_MEDIUM	"7.4b BETA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.4b BETA (2013 Jul 28)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.4b BETA (2013 Jul 28, compiled "
+#define VIM_VERSION_NODOT	"vim74"
+#define VIM_VERSION_SHORT	"7.4"
+#define VIM_VERSION_MEDIUM	"7.4"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.4 (2013 Aug 10)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.4 (2013 Aug 10, compiled "
--- a/src/vim.def
+++ b/src/vim.def
@@ -1,4 +1,4 @@
 CODE PRELOAD EXECUTEONLY
 DATA MULTIPLE SHARED
-DESCRIPTION 'Vim 7.4b'
+DESCRIPTION 'Vim 7.4'
 HEAPSIZE 0,0
--- a/src/vim16.def
+++ b/src/vim16.def
@@ -1,5 +1,5 @@
 CODE PRELOAD EXECUTEONLY
 DATA MULTIPLE SHARED
-DESCRIPTION 'Vim 7.4b'
+DESCRIPTION 'Vim 7.4'
 STACKSIZE 16000
 HEAPSIZE 10000