patch 7.4.1010

Problem: Some developers are unhappy while running tests. Solution: Add a test and some color.
patch 7.4.1009
2025-12-08 16:26:16 +00:00 · 2015-12-31 20:46:39 +01:00 · 2015-12-31 19:53:21 +01:00 · 2015-12-31 19:07:19 +01:00 · 2015-12-31 18:29:46 +01:00 · 2015-12-31 16:21:52 +01:00
974 changed files with 119288 additions and 46272 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 src/vim
 src/xxd/xxd
 src/auto/if_perl.c
+src/auto/gui_gtk_gresources.c
+src/auto/gui_gtk_gresources.h
 src/tags

 # We do need src/auto/configure.
@@ -36,19 +38,40 @@ src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib

+# Borland C++
+bcc.cfg
+*.ilc
+*.ild
+*.ilf
+*.ils
+*.map
+*.tds
+
+# NetBeans
+nbproject/*
+
+# Mac OSX
+src/xxd/xxd.dSYM
+
 # All platforms
 *.rej
 *.orig
 *.mo
 *.swp
 *~
+*.pyc
+*.log
 src/po/vim.pot

 # Generated by "make test"
-src/po/*.ck 
-src/testdir/mbyte.vim 
-src/testdir/mzscheme.vim 
-src/testdir/lua.vim 
-src/testdir/small.vim 
-src/testdir/tiny.vim 
+src/po/*.ck
+src/testdir/mbyte.vim
+src/testdir/mzscheme.vim
+src/testdir/lua.vim
+src/testdir/small.vim
+src/testdir/tiny.vim
 src/testdir/test*.out
+src/testdir/test*.failed
+src/testdir/test.log
+src/testdir/dostmp/*
+src/memfile_test
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,45 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+env:
+  - COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
+    "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
+    CHECK_AUTOCONF=yes
+  - COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+  - COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+  - COVERAGE=no FEATURES=tiny  CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
+
+sudo: false
+
+branches:
+  except:
+    - /^v[0-9]/
+
+addons:
+  apt:
+    packages:
+      - autoconf
+      - lcov
+      - libperl-dev
+      - python-dev
+      - python3-dev
+      - liblua5.1-0-dev
+      - lua5.1
+
+before_install:
+  - pip install --user cpp-coveralls
+
+script:
+  - NPROC=$(getconf _NPROCESSORS_ONLN)
+  - if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi
+  - if [ "x$SHADOWOPT" != x ]; then make -C src shadow; fi && (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC)
+  - ${SRCDIR}/vim --version
+  - make $SHADOWOPT test
+
+after_success:
+  - if [ x"$COVERAGE" = "xyes" ]; then ~/.local/bin/coveralls -b $SRCDIR -x .xs -e ${SRCDIR}/xxd -e ${SRCDIR}/if_perl.c --encodings utf-8 latin-1 EUC-KR; fi
+
+# vim:set sts=2 sw=2 tw=0 et:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,54 @@
+# Contributing to Vim
+
+Patches are welcome in whatever form.
+Discussions about patches happen on the vim-dev maillist.
+If you create a pull request on GitHub it will be
+forwarded to the vim-dev maillist.  You can also send your patch there
+directly.  An attachment with a unified diff format is preferred.
+Information about the maillist can be found [on the Vim website].
+
+[on the Vim website]: http://www.vim.org/maillist.php#vim-dev
+
+Please consider adding a test.  Test coverage isn't very good yet, this needs
+to improve.  Look through recent patches for examples.  The tests are located
+under "src/testdir".
+
+
+# Reporting issues
+
+We use GitHub issues, but that is not a requirement.  Writing to the Vim
+maillist is also fine.
+
+Please use the GitHub issues only for actual issues. If you are not 100% sure
+that your problem is a Vim issue, please first discuss this on the Vim user
+maillist.  Try reproducing the problem without any plugins or settings:
+
+    vim -N -u NONE
+
+If you report an issue, please describe exactly how to reproduce it.
+For example, don't say "insert some text" but say what you did exactly:
+"ahere is some text&lt;Esc&gt;".
+Ideally, the steps you list can be used to write a test to verify the problem
+is fixed.
+
+Feel free to report even the smallest problem, also typos in the documentation.
+
+You can find known issues in the todo file: ":help todo".
+Or open [the todo file] on GitHub to see the latest version.
+
+[the todo file]: https://github.com/vim/vim/blob/master/runtime/doc/todo.txt
+
+
+# Syntax, indent and other runtime files
+
+The latest version of these files can be obtained from the repository.
+They are usually not updated with numbered patches.
+
+If you find a problem with one of these files or have a suggestion for
+improvement, please first try to contact the maintainer directly.
+Look in the header of the file for the name and email address.
+
+The maintainer will take care of issues and send updates to Bram for 
+distribution with Vim.
+
+If the maintainer does not react, contact the vim-dev maillist.
--- a/8
+++ b/8
@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...

-		Version 7.3.  Also runs under UNIX, MSDOS and other systems.
-		vim73rt.tgz  contains the documentation and syntax files.
-		vim73bin.tgz contains the binaries.
-		vim73src.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/38
+++ b/38
@@ -3,6 +3,9 @@

 # source files for all source archives
 SRC_ALL =	\
+		.hgignore \
+		.travis.yml \
+		appveyor.yml \
 		src/README.txt \
 		src/arabic.c \
 		src/arabic.h \
@@ -10,6 +13,8 @@ SRC_ALL =	\
 		src/blowfish.c \
 		src/buffer.c \
 		src/charset.c \
+		src/crypt.c \
+		src/crypt_zip.c \
 		src/diff.c \
 		src/digraph.c \
 		src/edit.c \
@@ -79,15 +84,37 @@ SRC_ALL =	\
 		src/xxd/xxd.c \
 		src/main.aap \
 		src/testdir/main.aap \
+		src/testdir/README.txt \
+		src/testdir/Make_all.mak \
 		src/testdir/*.in \
+		src/testdir/sautest/autoload/*.vim \
+		src/testdir/runtest.vim \
 		src/testdir/test[0-9]*.ok \
+		src/testdir/test[0-9]*a.ok \
+		src/testdir/test_[a-z]*.ok \
 		src/testdir/test49.vim \
 		src/testdir/test60.vim \
 		src/testdir/test83-tags? \
+		src/testdir/test77a.com \
+		src/testdir/test_*.vim \
+		src/testdir/python2/*.py \
+		src/testdir/python3/*.py \
+		src/testdir/pythonx/*.py \
+		src/testdir/pythonx/topmodule/__init__.py \
+		src/testdir/pythonx/topmodule/submodule/__init__.py \
+		src/testdir/pythonx/topmodule/submodule/subsubmodule/__init__.py \
+		src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
+		src/testdir/python_after/*.py \
+		src/testdir/python_before/*.py \
+		src/testdir/bench*.in \
+		src/testdir/bench*.vim \
+		src/testdir/samples/*.txt \
 		src/proto.h \
 		src/proto/blowfish.pro \
 		src/proto/buffer.pro \
 		src/proto/charset.pro \
+		src/proto/crypt.pro \
+		src/proto/crypt_zip.pro \
 		src/proto/diff.pro \
 		src/proto/digraph.pro \
 		src/proto/edit.pro \
@@ -143,6 +170,7 @@ SRC_UNIX =	\
 		README_src.txt \
 		configure \
 		pixmaps/*.xpm \
+		pixmaps/*.png \
 		pixmaps/gen-inline-pixbufs.sh \
 		pixmaps/stock_icons.h \
 		src/INSTALL \
@@ -163,6 +191,7 @@ SRC_UNIX =	\
 		src/gui_gtk_f.c \
 		src/gui_gtk_f.h \
 		src/gui_gtk_x11.c \
+		src/gui_gtk_gresources.xml \
 		src/gui_motif.c \
 		src/gui_xmdlg.c \
 		src/gui_xmebw.c \
@@ -188,6 +217,7 @@ SRC_UNIX =	\
 		src/proto/gui_athena.pro \
 		src/proto/gui_gtk.pro \
 		src/proto/gui_gtk_x11.pro \
+		src/proto/gui_gtk_gresources.pro \
 		src/proto/gui_motif.pro \
 		src/proto/gui_xmdlg.pro \
 		src/proto/gui_x11.pro \
@@ -257,6 +287,7 @@ SRC_DOS =	\
 		src/Make_bc3.mak \
 		src/Make_bc5.mak \
 		src/Make_cyg.mak \
+		src/Make_cyg_ming.mak \
 		src/Make_djg.mak \
 		src/Make_ivc.mak \
 		src/Make_dvc.mak \
@@ -274,6 +305,8 @@ SRC_DOS =	\
 		src/dosinst.h \
 		src/glbl_ime.cpp \
 		src/glbl_ime.h \
+		src/gui_dwrite.cpp \
+		src/gui_dwrite.h \
 		src/gui_w16.c \
 		src/gui_w32.c \
 		src/gui_w48.c \
@@ -455,6 +488,8 @@ SRC_EXTRA =	\
 # runtime files for all distributions
 RT_ALL =	\
 		README.txt \
+		README.md \
+		CONTRIBUTING.md \
 		runtime/bugreport.vim \
 		runtime/doc/*.awk \
 		runtime/doc/*.pl \
@@ -554,6 +589,8 @@ RT_UNIX =	\
 		runtime/vim32x32.xpm \
 		runtime/vim48x48.png \
 		runtime/vim48x48.xpm \
+		runtime/gvim.desktop \
+		runtime/vim.desktop \

 # Unix and DOS runtime without CR-LF translation
 RT_UNIX_DOS_BIN =	\
@@ -685,6 +722,7 @@ LANG_GEN = \
 		runtime/doc/*-fr.UTF-8.1 \
 		runtime/doc/*-it.1 \
 		runtime/doc/*-it.UTF-8.1 \
+		runtime/doc/*-ja.UTF-8.1 \
 		runtime/doc/*-pl.1 \
 		runtime/doc/*-pl.UTF-8.1 \
 		runtime/doc/*-ru.1 \
--- a/129
+++ b/129
@@ -74,14 +74,17 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #    Before creating an archive first delete all backup files, *.orig, etc.

 MAJOR = 7
-MINOR = 3
+MINOR = 4

 # Uncomment this line if the Win32s version is to be included.
-DOSBIN_S =  dosbin_s
+# DOSBIN_S =  dosbin_s

 # Uncomment this line if the 16 bit DOS version is to be included.
 # DOSBIN_D16 = dosbin_d16

+# Uncomment this line if the 32 bit DOS version is to be included.
+# DOSBIN_D32 = dosbin_d32
+
 # CHECKLIST for creating a new version:
 #
 # - Update Vim version number.  For a test version in: src/version.h, Contents,
@@ -89,8 +92,6 @@ DOSBIN_S =  dosbin_s
 #   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.
@@ -99,8 +100,14 @@ DOSBIN_S =  dosbin_s
 # - 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.
@@ -108,8 +115,8 @@ DOSBIN_S =  dosbin_s
 # - 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.
@@ -128,62 +135,49 @@ DOSBIN_S =  dosbin_s
 # PC:
 # - Run make on Unix to update the ".mo" files.
 # - "make dossrc" and "make dosrt".  Unpack the archives on a PC.
-# 16 bit DOS version: (OBSOLETE, 16 bit version doesn't build)
-# - Set environment for compiling with Borland C++ 3.1.
-# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
-#   case set environment for compiling with Borland C++ 4.0 and do
-#   "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
-#   NOTE: this currently fails because Vim is too big.
-# - "make test" and check the output.
-# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
-#   "uninstald16.exe".
-# 32 bit DOS version:
-# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
-# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
-#   "ALL DONE".
-# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
-#   "uninstald32.exe".
 # Win32 console version:
-# - Set environment for Visual C++ 2008, e.g.:
-#   "E:\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat".  Or, when using the
-#   Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the paths when necessary).
-#   For Windows 98/ME the 2003 version is required, but then it won't work on
-#   Windows 7 and 64 bit.
-# - "nmake -f Make_mvc.mak"
-# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
-# - Rename the executables to "vimw32.exe", "xxdw32.exe".
+# - Set environment for Visual C++ 2008, e.g.: "msvc2008.bat"  Or:
+#   "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat".
+#   Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
+#   paths when necessary).
+#   For Windows 98/ME the 2003 version is required, but then the executable
+#   won't work on Windows 7 and 64 bit systems.
+# - "nmake -f Make_mvc.mak"  (use the same path as for vcvars32.bat)
+# - Run the tests:
+#   > rm testdir/*.out
+#   > nmake -f Make_mvc.mak test
+#   - check the output.
+# - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
 # - Rename vim.pdb to vimw32.pdb.
-# - When building the Win32s version later, delete vimrun.exe, install.exe and
-#   uninstal.exe.  Otherwise rename executables to installw32.exe and
-#   uninstalw32.exe.
+# - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
 # Win32 GUI version:
-# - "nmake -f Make_mvc.mak GUI=yes.
+# - "nmake -f Make_mvc.mak GUI=yes"
+# - Run the tests:
+#   > cd testdir
+#   > rm *.out
+#   > nmake -f Make_dos.mak VIMPROG=..\gvim
+#   - check the output.
 # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
 # - Move gvim.pdb to here.
 # - Delete vimrun.exe, install.exe and uninstal.exe.
 # - Copy "GvimExt/gvimext.dll" to here.
 # Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME:
 # - Run src/bigvim.bat ("nmake -f Make_mvc.mak GUI=yes OLE=yes IME=yes ...)
+# - Run the tests:
+#   > cd testdir
+#   > rm *.out
+#   > nmake -f Make_dos.mak VIMPROG=..\gvim
+#   - check the output.
 # - Rename "gvim.exe" to "gvim_ole.exe".
 # - Rename gvim.pdb to "gvim_ole.pdb".
 # - Delete install.exe and uninstal.exe.
-# - If building the Win32s version delete vimrun.exe.
-# Win32s GUI version:
-# - Set environment for Visual C++ 4.1 (requires a new console window):
-#   "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
-# - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
-# - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
-# - Rename "gvim.exe" to "gvim_w32s.exe".
-# - Rename "install.exe" to "installw32.exe"
-# - Rename "uninstal.exe" to "uninstalw32.exe"
-# - The produced uninstalw32.exe and vimrun.exe are used.
 # Create the archives:
 # - Copy all the "*.exe" files to where this Makefile is.
 # - Copy all the "*.pdb" files to where this Makefile is.
 # - "make dosbin".
 # NSIS self installing exe:
 # - To get NSIS see http://nsis.sourceforge.net
-# - Make sure gvim_ole.exe, vimd32.exe, vimw32.exe, installw32.exe,
+# - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
 #   uninstalw32.exe and xxdw32.exe have been build as mentioned above.
 # - copy these files (get them from a binary archive or build them):
 #	gvimext.dll in src/GvimExt
@@ -196,7 +190,44 @@ DOSBIN_S =  dosbin_s
 # - go to ../nsis and do "makensis gvim.nsi" (takes a few minutes).
 # - Copy gvim##.exe to the dist directory.
 #
-# OS/2: (OBSOLETE, OS/2 version is no longer distributed)
+# 64 bit builds (these are not in the normal distribution, the 32 bit build
+# works just fine on 64 bit systems).
+# Like the console and GUI version, but first run vcvars64.bat or
+#   "..\VC\vcvarsall.bat x86_amd64".
+# - "nmake -f Make_mvc.mak"
+# - "nmake -f Make_mvc.mak GUI=yes"
+# Or run src/bigvim64.bat for an OLE version.
+#
+# OBSOLETE systems: You can build this if you have an appropriate system.
+#
+# 16 bit DOS version: (doesn't build anywhere)
+# - Set environment for compiling with Borland C++ 3.1.
+# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
+#   case set environment for compiling with Borland C++ 4.0 and do
+#   "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
+#   NOTE: this currently fails because Vim is too big.
+# - "make test" and check the output.
+# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
+#   "uninstald16.exe".
+#
+# 32 bit DOS version: (requires Windows XP or earlier)
+# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
+# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
+#   "ALL DONE".
+# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
+#   "uninstald32.exe".
+#
+# Win32s GUI version: (requires very old compiler)
+# - Set environment for Visual C++ 4.1 (requires a new console window):
+#   "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
+# - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
+# - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
+# - Rename "gvim.exe" to "gvim_w32s.exe".
+# - Rename "install.exe" to "installw32.exe"
+# - Rename "uninstal.exe" to "uninstalw32.exe"
+# - The produced uninstalw32.exe and vimrun.exe are used.
+#
+# OS/2: (requires an OS/2 system)
 # - Unpack the Unix archive.
 # - "make -f Make_os2.mak".
 # - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy
@@ -295,6 +326,8 @@ unixall: dist prepare
 		$(LANG_SRC) \
 		| (cd dist/$(VIMRTDIR); tar xf -)
 # Need to use a "distclean" config.mk file
+# Note: this file is not included in the repository to avoid problems, but it's
+# OK to put it in the archive.
 	cp -f src/config.mk.dist dist/$(VIMRTDIR)/src/auto/config.mk
 # Create an empty config.h file, make dependencies require it
 	touch dist/$(VIMRTDIR)/src/auto/config.h
@@ -450,7 +483,7 @@ runtime_unix2dos: dosrt_unix2dos
 	cd dist/vim/$(VIMRTDIR); tar cf - * \
 		| (cd ../../../runtime/dos; tar xf -)

-dosbin: prepare dosbin_gvim dosbin_w32 dosbin_d32 dosbin_ole $(DOSBIN_S) $(DOSBIN_D16)
+dosbin: prepare dosbin_gvim dosbin_w32 $(DOSBIN_D32) dosbin_ole $(DOSBIN_S) $(DOSBIN_D16)

 # make Win32 gvim
 dosbin_gvim: dist no_title.vim dist/$(COMMENT_GVIM)
--- a/README.md
+++ b/README.md
@@ -0,0 +1,124 @@
+`README.md` for version 7.4 of Vim: Vi IMproved.
+[![Build Status](https://travis-ci.org/vim/vim.svg?branch=master)](https://travis-ci.org/vim/vim)
+[![Coverage Status](https://coveralls.io/repos/vim/vim/badge.svg?branch=master&service=github)](https://coveralls.io/github/vim/vim?branch=master)
+[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
+
+
+## What is Vim? ##
+
+Vim is an almost compatible version of the UNIX editor Vi.  Many new features
+have been added: multi-level undo, syntax highlighting, command line history,
+on-line help, spell checking, filename completion, block operations, etc.
+There is also a Graphical User Interface (GUI) available.  See
+`runtime/doc/vi_diff.txt` for differences with Vi.
+
+This editor is very useful for editing programs and other plain text files.
+All commands are given with normal keyboard characters, so those who can type
+with ten fingers can work very fast.  Additionally, function keys can be
+defined by the user, and the mouse can be used.
+
+Vim runs under Amiga DOS, MS-DOS, MS-Windows (95, 98, Me, NT, 2000, XP, Vista,
+7), Atari MiNT, Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of
+UNIX.  Porting to other systems should not be very difficult.
+
+
+## Distribution ##
+
+You can often use your favorite package manager to install Vim.  On Mac and
+Linux a small version of Vim is pre-installed, you still need to install Vim
+if you want more features.
+
+There are separate distributions for Unix, PC, Amiga and some other systems.
+This `README.md` file comes with the runtime archive.  It includes the
+documentation, syntax files and other files that are used at runtime.  To run
+Vim you must get either one of the binary archives or a source archive.
+Which one you need depends on the system you want to run it on and whether you
+want or must compile it yourself.  Check http://www.vim.org/download.php for
+an overview of currently available distributions.
+
+
+## Documentation ##
+
+The vim tutor is a one hour training course for beginners.  Mostly it can be
+started as `vimtutor`.  See `:help tutor` for more information.
+
+The best is to use `:help` in Vim.  If you don't have an executable yet, read
+`runtime/doc/help.txt`.  It contains pointers to the other documentation
+files.  The User Manual reads like a book and is recommended to learn to use
+Vim.  See `:help user-manual`.
+
+
+## Copying ##
+
+Vim is Charityware.  You can use and copy it as much as you like, but you are
+encouraged to make a donation to help orphans in Uganda.  Please read the file
+`runtime/doc/uganda.txt` for details (do `:help uganda` inside Vim).
+
+Summary of the license: There are no restrictions on using or distributing an
+unmodified copy of Vim.  Parts of Vim may also be distributed, but the license
+text must always be included.  For modified versions a few restrictions apply.
+The license is GPL compatible, you may compile Vim with GPL libraries and
+distribute it.
+
+
+## Sponsoring ##
+
+Fixing bugs and adding new features takes a lot of time and effort.  To show
+your appreciation for the work and motivate Bram and others to continue
+working on Vim please send a donation.
+
+Since Bram is back to a paid job the money will now be used to help children
+in Uganda.  See `runtime/doc/uganda.txt`.  But at the same time donations
+increase Bram's motivation to keep working on Vim!
+
+For the most recent information about sponsoring look on the Vim web site:
+	http://www.vim.org/sponsor/
+
+
+## Compiling ##
+
+If you obtained a binary distribution you don't need to compile Vim.  If you
+obtained a source distribution, all the stuff for compiling Vim is in the
+`src` directory.  See `src/INSTALL` for instructions.
+
+
+## Installation ##
+
+See one of these files for system-specific instructions:
+
+	README_ami.txt		Amiga
+	README_unix.txt		Unix
+	README_dos.txt		MS-DOS and MS-Windows
+	README_os2.txt		OS/2
+	README_mac.txt		Macintosh
+	README_vms.txt		VMS
+
+There are more `README_*.txt` files, depending on the distribution you used.
+
+
+## Contributing ##
+
+If you would like to help making Vim better, see the [CONTRIBUTING.md](https://github.com/vim/vim/blob/master/CONTRIBUTING.md) file.
+
+
+## Information ##
+
+The latest news about Vim can be found on the Vim home page:
+	http://www.vim.org/
+
+If you have problems, have a look at the Vim documentation or tips:
+	http://www.vim.org/docs.php
+	http://vim.wikia.com/wiki/Vim_Tips_Wiki
+
+If you still have problems or any other questions, use one of the mailing
+lists to discuss them with Vim users and developers:
+	http://www.vim.org/maillist.php
+
+If nothing else works, report bugs directly:
+	Bram Moolenaar <Bram@vim.org>
+
+
+## Main author ##
+
+Send any other comments, patches, flowers and suggestions to:
+	Bram Moolenaar <Bram@vim.org>
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
-README.txt for version 7.3 of Vim: Vi IMproved.
+README.txt for version 7.4 of Vim: Vi IMproved.


-WHAT IS VIM
+WHAT IS VIM?

 Vim is an almost compatible version of the UNIX editor Vi.  Many new features
 have been added: multi-level undo, syntax highlighting, command line history,
@@ -21,6 +21,10 @@ UNIX.  Porting to other systems should not be very difficult.

 DISTRIBUTION

+You can often use your favorite package manager to install Vim.  On Mac and
+Linux a small version of Vim is pre-installed, you still need to install Vim
+if you want more features.
+
 There are separate distributions for Unix, PC, Amiga and some other systems.
 This README.txt file comes with the runtime archive.  It includes the
 documentation, syntax files and other files that are used at runtime.  To run
@@ -94,8 +98,9 @@ INFORMATION
 The latest news about Vim can be found on the Vim home page:
 	http://www.vim.org/

-If you have problems, have a look at the Vim FAQ:
-	http://vimdoc.sf.net/vimfaq.html
+If you have problems, have a look at the Vim documentation or tips:
+	http://www.vim.org/docs.php
+	http://vim.wikia.com/wiki/Vim_Tips_Wiki

 If you still have problems or any other questions, use one of the mailing
 lists to discuss them with Vim users and developers:
@@ -110,6 +115,3 @@ MAIN AUTHOR
 Send any other comments, patches, flowers and suggestions to:

 	Bram Moolenaar		E-mail:	Bram@vim.org
-	Finsterruetihof 1
-	8134 Adliswil
-	Switzerland
--- a/README_ami.txt
+++ b/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.3 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.3 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.3 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,19 +1,16 @@
-README_bindos.txt for version 7.3 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.
-These files are in the runtime archive (vim73rt.zip).
+These files are in the runtime archive (vim74rt.zip).


 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim73d16.zip	16 bit DOS version
-	vim73d32.zip	32 bit DOS version
-	vim73w32.zip	Windows 95/98/NT/etc. console version
-	gvim73.zip	Windows 95/98/NT/etc. GUI version
-	gvim73ole.zip	Windows 95/98/NT/etc. GUI version with OLE
-	gvim73_s.zip	Windows 3.1 GUI version
+	vim74w32.zip	Windows 95/98/NT/etc. console version
+	gvim74.zip	Windows 95/98/NT/etc. GUI version
+	gvim74ole.zip	Windows 95/98/NT/etc. GUI version with OLE

-You MUST also get the runtime archive (vim73rt.zip).
-The sources are also available (vim73src.zip).
+You MUST also get the runtime archive (vim74rt.zip).
+The sources are also available (vim74src.zip).
--- a/README_dos.txt
+++ b/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.3 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.
@@ -47,13 +47,13 @@ These are the normal steps to install Vim from the .zip archives:
   Binary and runtime Vim archives are normally unpacked in the same location,
   on top of each other.

-2. Unpack the zip archives.  This will create a new directory "vim\vim73",
+2. Unpack the zip archives.  This will create a new directory "vim\vim74",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d gvim73.zip
-	unzip vim73w32.zip
+	pkunzip -d gvim74.zip
+	unzip vim74w32.zip

   You need to unpack the runtime archive and at least one of the binary
   archives.  When using more than one binary version, be careful not to
@@ -69,7 +69,7 @@ These are the normal steps to install Vim from the .zip archives:
   archive and follow the instructions in the documentation.

 3. Change to the new directory:
-	cd vim\vim73
+	cd vim\vim74
   Run the "install.exe" program.  It will ask you a number of questions about
   how you would like to have your Vim setup.  Among these are:
   - You can tell it to write a "_vimrc" file with your preferences in the
@@ -80,8 +80,8 @@ These are the normal steps to install Vim from the .zip archives:
     console or in a shell.  You can select one of the directories in your
     $PATH.  If you skip this, you can add Vim to the search path manually:
     The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim73
-	set path=%path%;D:\editors\vim\vim73
+	set path=%path%;C:\vim\vim74
+	set path=%path%;D:\editors\vim\vim74
   - Create entries for Vim on the desktop and in the Start menu.

 That's it!
@@ -93,8 +93,8 @@ Remarks:
  won't show a menubar.  Then you need to set the $VIM environment variable to
  point to the top directory of your Vim files.  Example:
    set VIM=C:\editors\vim
-  Vim version 7.3 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim73.  See ":help $VIM" for more information.
+  Vim version 7.4 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim74.  See ":help $VIM" for more information.

 - To avoid confusion between distributed files of different versions and your
  own modified vim scripts, it is recommended to use this directory layout:
@@ -105,14 +105,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\vim73\vim.exe		The Vim version 7.3 executable.
-	C:\vim\vim73\doc\*.txt		The version 7.3 documentation files.
-	C:\vim\vim73\bugreport.vim	A Vim version 7.3 script.
-	C:\vim\vim73\...		Other version 7.3 distributed files.
+	C:\vim\vim74\vim.exe		The Vim version 7.4 executable.
+	C:\vim\vim74\doc\*.txt		The version 7.4 documentation files.
+	C:\vim\vim74\bugreport.vim	A Vim version 7.4 script.
+	C:\vim\vim74\...		Other version 7.4 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim73".  Don't add
-  "vim73" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim74".  Don't add
+  "vim74" to $VIM, that won't work.

 - You can put your Vim executable anywhere else.  If the executable is not
  with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -136,8 +136,8 @@ Remarks:
     Select Properties.
  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim73\vim.exe
-	C:\command.com /c D:\editors\vim\vim73\vim.exe
+	C:\command.com /c C:\vim\vim74\vim.exe
+	C:\command.com /c D:\editors\vim\vim74\vim.exe
  6. Select the font, window size, etc. that you like.  If this isn't
     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
     mode".
--- a/README_extra.txt
+++ b/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 7.3 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.3 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.3 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,32 +1,32 @@
-README_os2.txt for version 7.3 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.


 NOTE: You will need two archives:
-  vim73rt.zip	contains the runtime files (same as for the PC version)
-  vim73os2.zip	contains the OS/2 executables
+  vim74rt.zip	contains the runtime files (same as for the PC version)
+  vim74os2.zip	contains the OS/2 executables

 1. Go to the directory where you want to put the Vim files.  Examples:
 	cd C:\
 	cd D:\editors

-2. Unpack the zip archives.  This will create a new directory "vim/vim73",
+2. Unpack the zip archives.  This will create a new directory "vim/vim74",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d vim73os2.zip
-	unzip vim73os2.zip
+	pkunzip -d vim74os2.zip
+	unzip vim74os2.zip

   After you unpacked the files, you can still move the whole directory tree
   to another location.

 3. Add the directory where vim.exe is to your path.  The simplest is to add a
   line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim73
-	set path=%path%;D:\editors\vim\vim73
+	set path=%path%;C:\vim\vim74
+	set path=%path%;D:\editors\vim\vim74

 That's it!

@@ -41,10 +41,10 @@ Extra remarks:
 	C:\vim\_viminfo			Dynamic info for 'viminfo'.
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\vim73\vim.exe		The Vim version 7.3 executable.
-	C:\vim\vim73\doc\*.txt		The version 7.3 documentation files.
-	C:\vim\vim73\bugreport.vim	A Vim version 7.3 script.
-	C:\vim\vim73\...		Other version 7.3 distributed files.
+	C:\vim\vim74\vim.exe		The Vim version 7.4 executable.
+	C:\vim\vim74\doc\*.txt		The version 7.4 documentation files.
+	C:\vim\vim74\bugreport.vim	A Vim version 7.4 script.
+	C:\vim\vim74\...		Other version 7.4 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim

--- a/README_os390.txt
+++ b/README_os390.txt
@@ -1,4 +1,4 @@
-README_zOS.txt for version 7.3 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.
@@ -29,7 +29,7 @@ console version).
 Compiling:
 ==========

-Vim can be compiled with or without GUI support. For 7.3 only the compilation
+Vim can be compiled with or without GUI support. For 7.4 only the compilation
 without GUI was tested. Below is a section about compiling with X11 but this
 is from an earlier version of Vim.

@@ -78,7 +78,7 @@ Change to the vim directory and do:
 With X11:
 ---------

-WARNING: This instruction was not tested with Vim 7.3.
+WARNING: This instruction was not tested with Vim 7.4.

 There are two ways for building VIM with X11 support. The first way is simple
 and results in a big executable (~13 Mb), the second needs a few additional
--- a/README_src.txt
+++ b/README_src.txt
@@ -1,10 +1,8 @@
-README_src.txt for version 7.3 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).  It is also used for other
-systems in combination with the extra archive (vim-7.3-extra.tar.gz, in the
-"extra" directory of ftp.vim.org).
+It is packed for Unix systems (NL line separator).

 For more information, see the README.txt file that comes with the runtime
-archive (vim-7.3-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-7.4-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
--- a/README_srcdos.txt
+++ b/README_srcdos.txt
@@ -1,8 +1,8 @@
-README_srcdos.txt for version 7.3 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.
-These files are in the runtime archive (vim73rt.zip).
+These files are in the runtime archive (vim74rt.zip).


 The DOS source archive contains the files needed to compile Vim on MS-DOS or
--- a/README_unix.txt
+++ b/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.3 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.3 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.3 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/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,20 @@
+version: "{build}"
+
+skip_tags: true
+
+before_build:
+  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
+  # Work around for Python 2.7.11's bug
+  - reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:32
+  - reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:64
+
+build_script:
+  - cd src
+  - sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
+  - nmake -f Make_mvc2.mak CPU=AMD64 GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64
+  - .\gvim -u NONE -c "redir @a | ver | 0put a | wq!" ver.txt
+  - type ver.txt
+
+test_script:
+  - cd testdir
+  - nmake -f Make_dos.mak VIMPROG=..\gvim
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -1,11 +1,11 @@
 # NSIS file to create a self-installing exe for Vim.
 # It requires NSIS version 2.0 or later.
-# Last Change:	2010 Jul 30
+# Last Change:	2014 Nov 5

 # WARNING: if you make changes to this script, look out for $0 to be valid,
 # because uninstall deletes most files in $0.

-# Location of gvim_ole.exe, vimd32.exe, GvimExt/*, etc.
+# Location of gvim_ole.exe, vimw32.exe, GvimExt/*, etc.
 !define VIMSRC "..\src"

 # Location of runtime files
@@ -22,7 +22,7 @@
 !define HAVE_NLS

 !define VER_MAJOR 7
-!define VER_MINOR 3
+!define VER_MINOR 4

 # ----------- No configurable settings below this line -----------

@@ -38,9 +38,9 @@ SetDatablockOptimize on
 RequestExecutionLevel highest

 ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer."
-DirText "Choose a directory to install Vim (must end in 'vim')"
+DirText "Choose a directory to install Vim (should contain 'vim')"
 Icon icons\vim_16c.ico
-# NSIS2 uses a different strategy with six diferent images in a strip...
+# NSIS2 uses a different strategy with six different images in a strip...
 #EnabledBitmap icons\enabled.bmp
 #DisabledBitmap icons\disabled.bmp
 UninstallText "This will uninstall Vim ${VER_MAJOR}.${VER_MINOR} from your system."
@@ -56,6 +56,9 @@ LicenseData ${VIMRT}\doc\uganda.nsis.txt
  !packhdr temp.dat "upx --best --compress-icons=1 temp.dat"
 !endif

+SetCompressor /SOLID lzma
+XPStyle on
+
 # This adds '\vim' to the user choice automagically.  The actual value is
 # obtained below with ReadINIStr.
 InstallDir "$PROGRAMFILES\Vim"
@@ -132,11 +135,6 @@ FunctionEnd
 # We only accept the directory if it ends in "vim".  Using .onVerifyInstDir has
 # the disadvantage that the browse dialog is difficult to use.
 Function CheckInstallDir
-  StrCpy $0 $INSTDIR 3 -3
-  StrCmp $0 "vim" PathGood
-    MessageBox MB_OK "The path must end in 'vim'."
-    Abort
-  PathGood:
 FunctionEnd

 Function .onInstSuccess
@@ -247,11 +245,10 @@ Section "Vim console program (vim.exe)"
 	ReadRegStr $R0 HKLM \
 	   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
 	IfErrors 0 lbl_winnt
-	    # Windows 95/98/ME
-	    File /oname=vim.exe ${VIMSRC}\vimd32.exe
+	    # Windows 95/98/ME: not supported
 	    Goto lbl_done
 	lbl_winnt:
-	    # Windows NT/2000/XT
+	    # Windows NT/2000/XP and later
 	    File /oname=vim.exe ${VIMSRC}\vimw32.exe
 	lbl_done:
 	StrCpy $2 "$2 vim view vimdiff"
--- a/pixmaps/stock_vim_build_tags.png
+++ b/pixmaps/stock_vim_build_tags.png
--- a/pixmaps/stock_vim_find_help.png
+++ b/pixmaps/stock_vim_find_help.png
--- a/pixmaps/stock_vim_save_all.png
+++ b/pixmaps/stock_vim_save_all.png
--- a/pixmaps/stock_vim_session_load.png
+++ b/pixmaps/stock_vim_session_load.png
--- a/pixmaps/stock_vim_session_new.png
+++ b/pixmaps/stock_vim_session_new.png
--- a/pixmaps/stock_vim_session_save.png
+++ b/pixmaps/stock_vim_session_save.png
--- a/pixmaps/stock_vim_shell.png
+++ b/pixmaps/stock_vim_shell.png
--- a/pixmaps/stock_vim_window_maximize.png
+++ b/pixmaps/stock_vim_window_maximize.png
--- a/pixmaps/stock_vim_window_maximize_width.png
+++ b/pixmaps/stock_vim_window_maximize_width.png
--- a/pixmaps/stock_vim_window_minimize.png
+++ b/pixmaps/stock_vim_window_minimize.png
--- a/pixmaps/stock_vim_window_minimize_width.png
+++ b/pixmaps/stock_vim_window_minimize_width.png
--- a/pixmaps/stock_vim_window_split.png
+++ b/pixmaps/stock_vim_window_split.png
--- a/pixmaps/stock_vim_window_split_vertical.png
+++ b/pixmaps/stock_vim_window_split_vertical.png
--- a/runtime/autoload/clojurecomplete.vim
+++ b/runtime/autoload/clojurecomplete.vim
--- a/runtime/autoload/getscript.vim
+++ b/runtime/autoload/getscript.vim
@@ -1,8 +1,8 @@
 " ---------------------------------------------------------------------
 " getscript.vim
 "  Author:	Charles E. Campbell
-"  Date:	Apr 17, 2013
-"  Version:	35
+"  Date:	Jan 21, 2014
+"  Version:	36
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
 "
@@ -15,7 +15,7 @@
 if exists("g:loaded_getscript")
 finish
 endif
-let g:loaded_getscript= "v35"
+let g:loaded_getscript= "v36"
 if &cp
 echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
 finish
@@ -208,8 +208,8 @@ fun! getscript#GetLatestVimScripts()
  let lastline    = line("$")
 "  call Decho("lastline#".lastline)
  let firstdir    = substitute(&rtp,',.*$','','')
-  let plugins     = split(globpath(firstdir,"plugin/*.vim"),'\n')
-  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/*.vim"),'\n')
+  let plugins     = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
+  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
  let foundscript = 0

  " this loop updates the GetLatestVimScripts.dat file
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2008 Jul 04
+" Last Change: 2014 Nov 05

 " These functions are used by the gzip plugin.

@@ -120,6 +120,8 @@ fun gzip#read(cmd)
    silent! exe "bwipe " . tmp_esc
    silent! exe "bwipe " . tmpe_esc
  endif
+  " Store the OK flag, so that we can use it when writing.
+  let b:uncompressOk = ok

  " Restore saved option values.
  let &pm = pm_save
@@ -146,8 +148,10 @@ endfun

 " After writing compressed file: Compress written file with "cmd"
 fun gzip#write(cmd)
+  if exists('b:uncompressOk') && !b:uncompressOk
+    echomsg "Not compressing file because uncompress failed; reset b:uncompressOk to compress anyway"
  " don't do anything if the cmd is not supported
-  if s:check(a:cmd)
+  elseif s:check(a:cmd)
    " Rename the file before compressing it.
    let nm = resolve(expand("<afile>"))
    let nmt = s:tempname(nm)
--- a/runtime/autoload/htmlcomplete.vim
+++ b/runtime/autoload/htmlcomplete.vim
@@ -1,7 +1,49 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2011 Apr 28
+" Last Change:	2014 Jun 20
+
+" Distinguish between HTML versions.
+" To use with other HTML versions add another "elseif" condition to match
+" proper DOCTYPE.
+function! htmlcomplete#DetectOmniFlavor()
+  if &filetype == 'xhtml'
+    let b:html_omni_flavor = 'xhtml10s'
+  else
+    let b:html_omni_flavor = 'html401t'
+  endif
+  let i = 1
+  let line = ""
+  while i < 10 && i < line("$")
+    let line = getline(i)
+    if line =~ '<!DOCTYPE.*\<DTD '
+      break
+    endif
+    let i += 1
+  endwhile
+  if line =~ '<!DOCTYPE.*\<DTD '  " doctype line found above
+    if line =~ ' HTML 3\.2'
+      let b:html_omni_flavor = 'html32'
+    elseif line =~ ' XHTML 1\.1'
+      let b:html_omni_flavor = 'xhtml11'
+    else    " two-step detection with strict/frameset/transitional
+      if line =~ ' XHTML 1\.0'
+	let b:html_omni_flavor = 'xhtml10'
+      elseif line =~ ' HTML 4\.01'
+	let b:html_omni_flavor = 'html401'
+      elseif line =~ ' HTML 4.0\>'
+	let b:html_omni_flavor = 'html40'
+      endif
+      if line =~ '\<Transitional\>'
+	let b:html_omni_flavor .= 't'
+      elseif line =~ '\<Frameset\>'
+	let b:html_omni_flavor .= 'f'
+      else
+	let b:html_omni_flavor .= 's'
+      endif
+    endif
+  endif
+endfunction

 function! htmlcomplete#CompleteTags(findstart, base)
  if a:findstart
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		May 03, 2013
+" Date:		Dec 30, 2014
 " Maintainer:	Charles E Campbell <drchipNOSPAM at campbellfamily dot biz>
-" Version:	14a	ASTRO-ONLY
+" Version:	15
 " Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
  finish
 endif
-let g:loaded_netrwSettings = "v14a"
+let g:loaded_netrwSettings = "v15"
 if v:version < 700
 echohl WarningMsg
 echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -31,7 +31,7 @@ endif
 " NetrwSettings: {{{1
 fun! netrwSettings#NetrwSettings()
  " this call is here largely just to insure that netrw has been loaded
-  call netrw#NetrwSavePosn()
+  call netrw#SavePosn()
  if !exists("g:loaded_netrw")
   echohl WarningMsg | echomsg "***sorry*** netrw needs to be loaded prior to using NetrwSettings" | echohl None
   return
@@ -98,6 +98,11 @@ fun! netrwSettings#NetrwSettings()

  put = ''
  put ='+ Netrw Browser Control'
+  if exists("g:netrw_altfile")
+   put = 'let g:netrw_altfile   = '.g:netrw_altfile
+  else
+   put = 'let g:netrw_altfile   = 0'
+  endif
  put = 'let g:netrw_alto              = '.g:netrw_alto
  put = 'let g:netrw_altv              = '.g:netrw_altv
  put = 'let g:netrw_banner            = '.g:netrw_banner
@@ -172,6 +177,7 @@ fun! netrwSettings#NetrwSettings()
  put = 'let g:netrw_sort_direction    = '.g:netrw_sort_direction
  put = 'let g:netrw_sort_options      = '.g:netrw_sort_options
  put = 'let g:netrw_sort_sequence     = '.g:netrw_sort_sequence
+  put = 'let g:netrw_servername        = '.g:netrw_servername
  put = 'let g:netrw_special_syntax    = '.g:netrw_special_syntax
  put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
  put = 'let g:netrw_ssh_cmd           = '.g:netrw_ssh_cmd
--- a/runtime/autoload/netrw_gitignore.vim
+++ b/runtime/autoload/netrw_gitignore.vim
@@ -0,0 +1,78 @@
+" netrw_gitignore#Hide: gitignore-based hiding
+"  Function returns a string of comma separated patterns convenient for
+"  assignment to `g:netrw_list_hide` option.
+"  Function can take additional filenames as arguments, example:
+"  netrw_gitignore#Hide('custom_gitignore1', 'custom_gitignore2')
+"
+" Usage examples:
+"  let g:netrw_list_hide = netrw_gitignore#Hide()
+"  let g:netrw_list_hide = netrw_gitignore#Hide() . 'more,hide,patterns'
+"
+" Copyright:    Copyright (C) 2013 Bruno Sutic {{{1
+"               Permission is hereby granted to use and distribute this code,
+"               with or without modifications, provided that this copyright
+"               notice is copied with it. Like anything else that's free,
+"               netrw_gitignore.vim is provided *as is* and comes with no
+"               warranty of any kind, either expressed or implied. By using
+"               this plugin, you agree that in no event will the copyright
+"               holder be liable for any damages resulting from the use
+"               of this software.
+function! netrw_gitignore#Hide(...)
+  let additional_files = a:000
+
+  let default_files = ['.gitignore', '.git/info/exclude']
+
+  " get existing global/system gitignore files
+  let global_gitignore = expand(substitute(system("git config --global core.excludesfile"), '\n', '', 'g'))
+  if global_gitignore !=# ''
+    let default_files = add(default_files, global_gitignore)
+  endif
+  let system_gitignore = expand(substitute(system("git config --system core.excludesfile"), '\n', '', 'g'))
+  if system_gitignore !=# ''
+    let default_files = add(default_files, system_gitignore)
+  endif
+
+  " append additional files if given as function arguments
+  if additional_files !=# []
+    let files = extend(default_files, additional_files)
+  else
+    let files = default_files
+  endif
+
+  " keep only existing/readable files
+  let gitignore_files = []
+  for file in files
+    if filereadable(file)
+      let gitignore_files = add(gitignore_files, file)
+    endif
+  endfor
+
+  " get contents of gitignore patterns from those files
+  let gitignore_lines = []
+  for file in gitignore_files
+    for line in readfile(file)
+      " filter empty lines and comments
+      if line !~# '^#' && line !~# '^$'
+        let gitignore_lines = add(gitignore_lines, line)
+      endif
+    endfor
+  endfor
+
+  " convert gitignore patterns to Netrw/Vim regex patterns
+  let escaped_lines = []
+  for line in gitignore_lines
+    let escaped = line
+    let escaped = substitute(escaped, '\*\*', '*', 'g')
+    let escaped = substitute(escaped, '\.', '\\.', 'g')
+    let escaped = substitute(escaped, '\$', '\\$', 'g')
+    let escaped = substitute(escaped, '*', '.*', 'g')
+    " correction: dot, dollar and asterisks chars shouldn't be escaped when
+    " within regex matching groups.
+    let escaped = substitute(escaped, '\(\[[^]]*\)\zs\\\.', '\.', 'g')
+    let escaped = substitute(escaped, '\(\[[^]]*\)\zs\\\$', '\$', 'g')
+    let escaped = substitute(escaped, '\(\[[^]]*\)\zs\.\*', '*', 'g')
+    let escaped_lines = add(escaped_lines, escaped)
+  endfor
+
+  return join(escaped_lines, ',')
+endfunction
--- a/runtime/autoload/phpcomplete.vim
+++ b/runtime/autoload/phpcomplete.vim
--- a/runtime/autoload/python3complete.vim
+++ b/runtime/autoload/python3complete.vim
@@ -1,7 +1,7 @@
 "python3complete.vim - Omni Completion for python
 " Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
-" Last Updated: 18 Jun 2009
+" Last Updated: 18 Jun 2009 (small fix 2015 Sep 14 from Debian)
 "
 " Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
 "
@@ -359,6 +359,7 @@ class PyParser:
    def __init__(self):
        self.top = Scope('global',0)
        self.scope = self.top
+        self.parserline = 0

    def _parsedotname(self,pre=None):
        #returns (dottedname, nexttoken)
--- a/runtime/autoload/pythoncomplete.vim
+++ b/runtime/autoload/pythoncomplete.vim
@@ -377,6 +377,7 @@ class PyParser:
    def __init__(self):
        self.top = Scope('global',0)
        self.scope = self.top
+        self.parserline = 0

    def _parsedotname(self,pre=None):
        #returns (dottedname, nexttoken)
--- a/runtime/autoload/rubycomplete.vim
+++ b/runtime/autoload/rubycomplete.vim
@@ -1,9 +1,7 @@
 " Vim completion script
 " Language:             Ruby
 " Maintainer:           Mark Guzman <segfault@hasno.info>
-" Last Change:          2009 Sep 28
-" URL:                  http://vim-ruby.rubyforge.org
-" Anon CVS:             See above site
+" URL:                  https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
 " Maintainer Version:   0.8.1
 " ----------------------------------------------------------------------------
@@ -12,16 +10,23 @@
 " ----------------------------------------------------------------------------

 " {{{ requirement checks
+
+function! s:ErrMsg(msg)
+    echohl ErrorMsg
+    echo a:msg
+    echohl None
+endfunction
+
 if !has('ruby')
-    s:ErrMsg( "Error: Rubycomplete requires vim compiled with +ruby" )
-    s:ErrMsg( "Error: falling back to syntax completion" )
+    call s:ErrMsg( "Error: Rubycomplete requires vim compiled with +ruby" )
+    call s:ErrMsg( "Error: falling back to syntax completion" )
    " lets fall back to syntax completion
    setlocal omnifunc=syntaxcomplete#Complete
    finish
 endif

 if version < 700
-    s:ErrMsg( "Error: Required vim >= 7.0" )
+    call s:ErrMsg( "Error: Required vim >= 7.0" )
    finish
 endif
 " }}} requirement checks
@@ -51,12 +56,6 @@ endif
 " {{{ vim-side support functions
 let s:rubycomplete_debug = 0

-function! s:ErrMsg(msg)
-    echohl ErrorMsg
-    echo a:msg
-    echohl None
-endfunction
-
 function! s:dprint(msg)
    if s:rubycomplete_debug == 1
        echom a:msg
@@ -133,7 +132,7 @@ function! s:GetRubyVarType(v)
    let stopline = 1
    let vtp = ''
    let pos = getpos('.')
-    let sstr = '^\s*#\s*@var\s*'.a:v.'\>\s\+[^ \t]\+\s*$'
+    let sstr = '^\s*#\s*@var\s*'.escape(a:v, '*').'\>\s\+[^ \t]\+\s*$'
    let [lnum,lcol] = searchpos(sstr,'nb',stopline)
    if lnum != 0 && lcol != 0
        call setpos('.',pos)
@@ -275,7 +274,7 @@ class VimRubyCompletion
    pare = /^\s*class\s*(.*)\s*<\s*(.*)\s*\n/.match( classdef )
    load_buffer_class( $2 ) if pare != nil  && $2 != name # load parent class if needed

-    mixre = /.*\n\s*include\s*(.*)\s*\n/.match( classdef )
+    mixre = /.*\n\s*(include|prepend)\s*(.*)\s*\n/.match( classdef )
    load_buffer_module( $2 ) if mixre != nil && $2 != name # load mixins if needed

    begin
@@ -364,6 +363,10 @@ class VimRubyCompletion
    print txt if @@debug
  end

+  def escape_vim_singlequote_string(str)
+    str.to_s.gsub(/'/,"\\'")
+  end
+
  def get_buffer_entity_list( type )
    # this will be a little expensive.
    loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
@@ -526,9 +529,9 @@ class VimRubyCompletion
  end

  def clean_sel(sel, msg)
-    sel.delete_if { |x| x == nil }
-    sel.uniq!
-    sel.grep(/^#{Regexp.quote(msg)}/) if msg != nil
+    ret = sel.reject{|x|x.nil?}.uniq
+    ret = ret.grep(/^#{Regexp.quote(msg)}/) if msg != nil
+    ret
  end

  def get_rails_view_methods
@@ -767,10 +770,10 @@ class VimRubyCompletion
    constants = clean_sel( constants, message )

    valid = []
-    valid += methods.collect { |m| { :name => m, :type => 'm' } }
-    valid += variables.collect { |v| { :name => v, :type => 'v' } }
-    valid += classes.collect { |c| { :name => c, :type => 't' } }
-    valid += constants.collect { |d| { :name => d, :type => 'd' } }
+    valid += methods.collect { |m| { :name => m.to_s, :type => 'm' } }
+    valid += variables.collect { |v| { :name => v.to_s, :type => 'v' } }
+    valid += classes.collect { |c| { :name => c.to_s, :type => 't' } }
+    valid += constants.collect { |d| { :name => d.to_s, :type => 'd' } }
    valid.sort! { |x,y| x[:name] <=> y[:name] }

    outp = ""
@@ -779,7 +782,7 @@ class VimRubyCompletion
    rg.step(150) do |x|
      stpos = 0+x
      enpos = 150+x
-      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ] }
+      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ].map{|x|escape_vim_singlequote_string(x)} }
      outp.sub!(/,$/, '')

      VIM::command("call extend(g:rubycomplete_completions, [%s])" % outp)
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2012 Jun 30
+" Last Change: 2013 Sep 03
 "
 " Additional contributors:
 "
@@ -302,7 +302,7 @@ func! tohtml#Convert2HTML(line1, line2) "{{{
  else "{{{
    let win_list = []
    let buf_list = []
-    windo | if &diff | call add(win_list, winbufnr(0)) | endif
+    windo if &diff | call add(win_list, winbufnr(0)) | endif
    let s:settings.whole_filler = 1
    let g:html_diff_win_num = 0
    for window in win_list
@@ -401,15 +401,15 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
  call add(html, '</head>')
  let body_line_num = len(html)
  if !empty(s:settings.prevent_copy)
-    call add(html, "<body onload='FixCharWidth();'>")
+    call add(html, "<body onload='FixCharWidth();".(s:settings.line_ids ? " JumpToLine();" : "")."'>")
    call add(html, "<!-- hidden divs used by javascript to get the width of a char -->")
    call add(html, "<div id='oneCharWidth'>0</div>")
    call add(html, "<div id='oneInputWidth'><input size='1' value='0'".tag_close."</div>")
    call add(html, "<div id='oneEmWidth' style='width: 1em;'></div>")
  else
-    call add(html, '<body>')
+    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
  endif
-  call add(html, "<table border='1' width='100%' id='vimCodeElement'>")
+  call add(html, "<table border='1' width='100%' id='vimCodeElement".s:settings.id_suffix."'>")

  call add(html, '<tr>')
  for buf in a:win_list
@@ -475,7 +475,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
    let temp = getline(1,'$')
    " clean out id on the main content container because we already set it on
    " the table
-    let temp[0] = substitute(temp[0], " id='vimCodeElement'", "", "")
+    let temp[0] = substitute(temp[0], " id='vimCodeElement[^']*'", "", "")
    " undo deletion of start and end part
    " so we can later save the file as valid html
    " TODO: restore using grabbed lines if undolevel is 1?
@@ -503,6 +503,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
  call add(html, s:body_end_line)
  call add(html, '</html>')

+  " The generated HTML is admittedly ugly and takes a LONG time to fold.
+  " Make sure the user doesn't do syntax folding when loading a generated file,
+  " using a modeline.
+  call add(html, '<!-- vim: set foldmethod=manual : -->')
+
  let i = 1
  let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
  " Find an unused file name if current file name is already in use
@@ -539,14 +544,12 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
    " add required javascript in reverse order so we can just call append again
    " and again without adjusting {{{

-    " insert script closing tag if any javascript is needed
-    if s:settings.dynamic_folds || !empty(s:settings.prevent_copy)
-      call append(style_start, [
-	    \ '',
-	    \ s:settings.use_xhtml ? '//]]>' : '-->',
-	    \ "</script>"
-	    \ ])
-    endif
+    " insert script closing tag
+    call append(style_start, [
+	  \ '',
+	  \ s:settings.use_xhtml ? '//]]>' : '-->',
+	  \ "</script>"
+	  \ ])

    " insert script which corrects the size of small input elements in
    " prevent_copy mode. See 2html.vim for details on why this is needed and how
@@ -565,13 +568,62 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ '  var emWidth = document.getElementById("oneEmWidth").clientWidth;',
 	    \ '  if (inputWidth > goodWidth) {',
 	    \ '    while (ratio < 100*goodWidth/emWidth && ratio < 100) {',
-	    \ '    ratio += 5;',
-	    \ '  }',
-	    \ '  document.getElementById("vimCodeElement").className = "em"+ratio;',
+	    \ '      ratio += 5;',
+	    \ '    }',
+	    \ '    document.getElementById("vimCodeElement'.s:settings.id_suffix.'").className = "em"+ratio;',
 	    \ '  }',
 	    \ '}'
 	    \ ])
    endif
+    "
+    " insert javascript to get IDs from line numbers, and to open a fold before
+    " jumping to any lines contained therein
+    call append(style_start, [
+	  \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
+	  \ "   * we corrected the raw number to a line ID.",
+	  \ "   */",
+	  \ "  if (lineElem) {",
+	  \ "    lineElem.scrollIntoView(true);",
+	  \ "  }",
+	  \ "  return true;",
+	  \ "}",
+	  \ "if ('onhashchange' in window) {",
+	  \ "  window.onhashchange = JumpToLine;",
+	  \ "}"
+	  \ ])
+    if s:settings.dynamic_folds
+      call append(style_start, [
+	    \ "",
+	    \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
+	    \ "  var node = lineElem;",
+	    \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
+	    \ "  {",
+	    \ "    if (node.className == 'closed-fold')",
+	    \ "    {",
+	    \ "      /* toggle open the fold ID (remove window ID) */",
+	    \ "      toggleFold(node.id.substr(4));",
+	    \ "    }",
+	    \ "    node = node.parentNode;",
+	    \ "  }",
+	    \ ])
+    endif
+    call append(style_start, [
+	  \ "",
+	  \ "/* function to open any folds containing a jumped-to line before jumping to it */",
+	  \ "function JumpToLine()",
+	  \ "{",
+	  \ "  var lineNum;",
+	  \ "  lineNum = window.location.hash;",
+	  \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
+	  \ "",
+	  \ "  if (lineNum.indexOf('L') == -1) {",
+	  \ "    lineNum = 'L'+lineNum;",
+	  \ "  }",
+	  \ "  if (lineNum.indexOf('W') == -1) {",
+	  \ "    lineNum = 'W1'+lineNum;",
+	  \ "  }",
+	  \ "  lineElem = document.getElementById(lineNum);"
+	  \ ])

    " Insert javascript to toggle matching folds open and closed in all windows,
    " if dynamic folding is active.
@@ -596,12 +648,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ ])
    endif

-    " insert script tag if any javascript is needed
-    if s:settings.dynamic_folds || s:settings.prevent_copy != ""
-      call append(style_start, [
-	    \ "<script type='text/javascript'>",
-	    \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
-    endif "}}}
+    " insert script tag; javascript is always needed for the line number
+    " normalization for URL hashes
+    call append(style_start, [
+	  \ "<script type='text/javascript'>",
+	  \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])

    " Insert styles from all the generated html documents and additional styles
    " for the table-based layout of the side-by-side diff. The diff should take
@@ -671,6 +722,7 @@ func! tohtml#GetUserSettings() "{{{
    call tohtml#GetOption(user_settings,     'no_invalid', 0 )
    call tohtml#GetOption(user_settings,   'whole_filler', 0 )
    call tohtml#GetOption(user_settings,      'use_xhtml', 0 )
+    call tohtml#GetOption(user_settings,       'line_ids', user_settings.number_lines )
    " }}}
    
    " override those settings that need it {{{
@@ -804,6 +856,20 @@ func! tohtml#GetUserSettings() "{{{
      let user_settings.no_invalid = 0
    endif

+    if exists('g:html_id_expr')
+      let user_settings.id_suffix = eval(g:html_id_expr)
+      if user_settings.id_suffix !~ '^[-_:.A-Za-z0-9]*$'
+	echohl WarningMsg
+	echomsg '2html: g:html_id_expr evaluated to invalid string for HTML id attributes'
+	echomsg '2html: Omitting user-specified suffix'
+	echohl None
+	sleep 3
+	let user_settings.id_suffix=""
+      endif
+    else
+      let user_settings.id_suffix=""
+    endif
+
    " TODO: font

    return user_settings
--- a/runtime/autoload/xmlcomplete.vim
+++ b/runtime/autoload/xmlcomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	XML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Aug 15
+" Last Change:	2013 Jun 29
 " Version: 1.9
 "
 " Changelog:
@@ -475,12 +475,12 @@ function! s:InCommentAt(line, col)
 endfunction

 function! s:SetKeywords()
-	let g:IsKeywordBak=&iskeyword
-	let &iskeyword='33-255'
+	let s:IsKeywordBak=&l:iskeyword
+	let &l:iskeyword='33-255'
 endfunction

 function! s:RestoreKeywords()
-	let &iskeyword=g:IsKeywordBak
+	let &l:iskeyword=s:IsKeywordBak
 endfunction

 function! s:Push(el, sname)
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -1,10 +1,10 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Apr 17, 2013
-" Version:	26
+" Date:		Jul 02, 2013
+" Version:	27
 " Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
-" Copyright:    Copyright (C) 2005-2012 Charles E. Campbell {{{1
+" Copyright:    Copyright (C) 2005-2013 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
@@ -13,13 +13,14 @@
 "               this plugin, you agree that in no event will the copyright
 "               holder be liable for any damages resulting from the use
 "               of this software.
+"redraw!|call DechoSep()|call inputsave()|call input("Press <cr> to continue")|call inputrestore()

 " ---------------------------------------------------------------------
 " Load Once: {{{1
 if &cp || exists("g:loaded_zip")
 finish
 endif
-let g:loaded_zip= "v26"
+let g:loaded_zip= "v27"
 if v:version < 702
 echohl WarningMsg
 echo "***warning*** this version of zip needs vim 7.2"
@@ -28,6 +29,7 @@ if v:version < 702
 endif
 let s:keepcpo= &cpo
 set cpo&vim
+"DechoTabOn

 let s:zipfile_escape = ' ?&;\'
 let s:ERROR          = 2
@@ -60,6 +62,16 @@ endif
 " zip#Browse: {{{2
 fun! zip#Browse(zipfile)
 "  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
+  " sanity check: insure that the zipfile has "PK" as its first two letters
+  "               (zipped files have a leading PK as a "magic cookie")
+  if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
+   exe "noautocmd e ".fnameescape(a:zipfile)
+"   call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
+   return
+"  else        " Decho
+"   call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file")
+  endif
+
  let repkeep= &report
  set report=10

@@ -197,6 +209,7 @@ fun! zip#Read(fname,mode)
  "   exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1)
  " but allows zipfile:... entries in quickfix lists
  let temp = tempname()
+"  call Decho("using temp file<".temp.">")
  let fn   = expand('%:p')
  exe "sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1).' > '.temp
 "  call Decho("exe sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1).' > '.temp)
@@ -208,7 +221,7 @@ fun! zip#Read(fname,mode)
  filetype detect

  " cleanup
-  keepj 0d
+  "  keepj 0d   " used to be needed for the ...r! ... method
  set nomod

  let &report= repkeep
--- a/runtime/colors/README.txt
+++ b/runtime/colors/README.txt
@@ -36,6 +36,14 @@ Some attributes (e.g., bold) might be set in the defaults that you want
 removed in your color scheme.  Use something like "gui=NONE" to remove the
 attributes.

+In case you want to set 'background' depending on the colorscheme selected,
+this autocmd might be useful:
+     autocmd SourcePre */colors/blue_sky.vim set background=dark
+Replace "blue_sky" with the name of the colorscheme.
+
+In case you want to tweak a colorscheme after it was loaded, check out that
+ColorScheme autocmd event.
+
 To see which highlight group is used where, find the help for
 "highlight-groups" and "group-name".

--- a/runtime/colors/delek.vim
+++ b/runtime/colors/delek.vim
@@ -1,10 +1,10 @@
 " Vim color file
-" Maintainer:	David Schweikert <dws@ee.ethz.ch>
-" Last Change:	2006 Apr 30
+" Maintainer:	David Schweikert <david@schweikert.ch>
+" Last Change:	2014 Mar 19

 hi clear

-let colors_name = "delek"
+let g:colors_name = "delek"

 " Normal should come first
 hi Normal     guifg=Black  guibg=White
@@ -28,7 +28,11 @@ hi NonText    ctermfg=Blue	   gui=bold guifg=gray guibg=white
 hi Pmenu      guibg=LightBlue
 hi PmenuSel   ctermfg=White	   ctermbg=DarkBlue  guifg=White  guibg=DarkBlue
 hi Question   ctermfg=DarkGreen    gui=bold guifg=SeaGreen
-hi Search     ctermfg=NONE	   ctermbg=Yellow guibg=Yellow guifg=NONE
+if &background == "light"
+    hi Search     ctermfg=NONE	   ctermbg=Yellow guibg=Yellow guifg=NONE
+else
+    hi Search     ctermfg=Black	   ctermbg=Yellow guibg=Yellow guifg=Black
+endif
 hi SpecialKey ctermfg=DarkBlue	   guifg=Blue
 hi StatusLine cterm=bold	   ctermbg=blue ctermfg=yellow guibg=gold guifg=blue
 hi StatusLineNC	cterm=bold	   ctermbg=blue ctermfg=black  guibg=gold guifg=blue
--- a/runtime/colors/industry.vim
+++ b/runtime/colors/industry.vim
@@ -0,0 +1,40 @@
+" Vim color file
+" Maintainer:	Shian Lee 
+" Last Change:	2014 Mar 6 (for vim 7.4)
+" Remark:	"industry" stands for 'industrial' color scheme. In industrial
+"		HMI (Human-Machine-Interface) programming, using a standard color
+"               scheme is mandatory in many cases (in traffic-lights for example): 
+"               LIGHT_RED is	    'Warning' 
+"               LIGHT_YELLOW is	    'Attention' 
+"               LIGHT_GREEN is	    'Normal' 
+"               LIGHT_MAGENTA is    'Warning-Attention' (light RED-YELLOW)
+"               LIGHT_CYAN is	    'Attention-Normal'  (light YELLOW-GREEN).
+"               BLACK is	    Dark-High-Contrast Background for maximum safety.
+"               BLUE is		    Shade of BLACK (not supposed to get attention).
+"
+"               Industrial color scheme is by nature clear, safe and productive. 
+"               Yet, depends on the file type's syntax, it might appear incorrect. 
+
+" Reset to dark background, then reset everything to defaults:
+set background=dark
+highlight clear
+if exists("syntax_on")
+    syntax reset
+endif
+
+let colors_name = "industry"
+
+" First set Normal to regular white on black text colors:
+hi Normal ctermfg=LightGray ctermbg=Black guifg=#dddddd	guibg=Black
+
+" Syntax highlighting (other color-groups using default, see :help group-name):
+hi Comment    cterm=NONE ctermfg=DarkCyan    	gui=NONE guifg=#00aaaa   	 
+hi Constant   cterm=NONE ctermfg=LightCyan   	gui=NONE guifg=#00ffff   	
+hi Identifier cterm=NONE ctermfg=LightMagenta   gui=NONE guifg=#ff00ff   
+hi Function   cterm=NONE ctermfg=LightGreen   	gui=NONE guifg=#00ff00   	
+hi Statement  cterm=NONE ctermfg=White	     	gui=bold guifg=#ffffff	     	
+hi PreProc    cterm=NONE ctermfg=Yellow		gui=NONE guifg=#ffff00 	
+hi Type	      cterm=NONE ctermfg=LightGreen	gui=bold guifg=#00ff00 		
+hi Special    cterm=NONE ctermfg=LightRed    	gui=NONE guifg=#ff0000    	
+hi Delimiter  cterm=NONE ctermfg=Yellow    	gui=NONE guifg=#ffff00    	
+
--- a/runtime/colors/koehler.vim
+++ b/runtime/colors/koehler.vim
@@ -2,7 +2,7 @@
 " vim: tw=0 ts=4 sw=4
 " Vim color file
 " Maintainer:	Ron Aaron <ron@ronware.org>
-" Last Change:	2006 Dec 10
+" Last Change:	2013 May 23

 hi clear
 set background=dark
@@ -43,6 +43,8 @@ hi MatchParen	  term=reverse  ctermfg=blue guibg=Blue
 hi TabLine		  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
 hi TabLineFill	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
 hi TabLineSel	  term=reverse	ctermfg=white ctermbg=lightblue guifg=white guibg=blue
+hi Underlined	  term=underline cterm=bold,underline ctermfg=lightblue guifg=lightblue gui=bold,underline
+hi Ignore		  ctermfg=black ctermbg=black guifg=black guibg=black
 hi link IncSearch		Visual
 hi link String			Constant
 hi link Character		Constant
--- a/runtime/colors/ron.vim
+++ b/runtime/colors/ron.vim
@@ -2,7 +2,7 @@
 " vim: tw=0 ts=4 sw=4
 " Vim color file
 " Maintainer:	Ron Aaron <ron@ronware.org>
-" Last Change:	2003 May 02
+" Last Change:	2013 May 24

 set background=dark
 hi clear
@@ -11,7 +11,7 @@ if exists("syntax_on")
 endif
 let g:colors_name = "ron"
 hi Normal		guifg=cyan	guibg=black
-hi NonText		guifg=brown
+hi NonText		guifg=yellow guibg=#303030
 hi comment		guifg=green
 hi constant		guifg=cyan	gui=bold
 hi identifier	guifg=cyan	gui=NONE
@@ -24,10 +24,11 @@ hi WarningMsg	guifg=Black	guibg=Green
 hi Error		guibg=Red
 hi Todo			guifg=Black	guibg=orange
 hi Cursor		guibg=#60a060 guifg=#00ff00
-hi Search		guibg=lightslateblue
+hi Search		guibg=darkgray guifg=black gui=bold 
 hi IncSearch	gui=NONE guibg=steelblue
 hi LineNr		guifg=darkgrey
 hi title		guifg=darkgrey
+hi ShowMarksHL ctermfg=cyan ctermbg=lightblue cterm=bold guifg=yellow guibg=black  gui=bold
 hi StatusLineNC	gui=NONE guifg=lightblue guibg=darkblue
 hi StatusLine	gui=bold	guifg=cyan	guibg=blue
 hi label		guifg=gold2
@@ -41,3 +42,4 @@ hi DiffDelete   guibg=coral
 hi Folded		guibg=gray30
 hi FoldColumn	guibg=gray30 guifg=white
 hi cIf0			guifg=gray
+hi diffOnly	guifg=red gui=bold
--- a/runtime/compiler/checkstyle.vim
+++ b/runtime/compiler/checkstyle.vim
@@ -1,8 +1,7 @@
 " Vim compiler file
 " Compiler:	Checkstyle
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/checkstyle.vim
-" Last Change:	2004 Nov 27
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 26

 if exists("current_compiler")
  finish
@@ -17,4 +16,4 @@ CompilerSet makeprg=java\ com.puppycrawl.tools.checkstyle.Main\ -f\ plain

 " sample error: WebTable.java:282: '+=' is not preceeded with whitespace.
 "		WebTable.java:201:1: '{' should be on the previous line.
-CompilerSet errorformat=%f:%l:\ %m,%f:%l:%v:\ %m,%-G%.%#
+CompilerSet errorformat=%f:%l:%v:\ %m,%f:%l:\ %m,%-G%.%#
--- a/runtime/compiler/eruby.vim
+++ b/runtime/compiler/eruby.vim
@@ -1,9 +1,7 @@
 " Vim compiler file
 " Language:		eRuby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2008 Aug 1
-" URL:			http://vim-ruby.rubyforge.org
-" Anon CVS:		See above site
+" URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>

 if exists("current_compiler")
--- a/runtime/compiler/gcc.vim
+++ b/runtime/compiler/gcc.vim
@@ -25,10 +25,10 @@ CompilerSet errorformat=
      \%f:%l:\ %tarning:\ %m,
      \%f:%l:\ %m,
      \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
-      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
-      \%D%*\\a:\ Entering\ directory\ `%f',
-      \%X%*\\a:\ Leaving\ directory\ `%f',
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ [`']%f',
+      \%D%*\\a:\ Entering\ directory\ [`']%f',
+      \%X%*\\a:\ Leaving\ directory\ [`']%f',
      \%DMaking\ %*\\a\ in\ %f

 if exists('g:compiler_gcc_ignore_unmatched_lines')
--- a/runtime/compiler/go.vim
+++ b/runtime/compiler/go.vim
@@ -0,0 +1,29 @@
+" Vim compiler file
+" Compiler:	Go
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-go)
+" Last Change:	2014 Aug 16
+
+if exists('current_compiler')
+  finish
+endif
+let current_compiler = 'go'
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+CompilerSet makeprg=go\ build
+CompilerSet errorformat=
+    \%-G#\ %.%#,
+    \%A%f:%l:%c:\ %m,
+    \%A%f:%l:\ %m,
+    \%C%*\\s%m,
+    \%-G%.%#
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: sw=2 sts=2 et
--- a/runtime/compiler/haml.vim
+++ b/runtime/compiler/haml.vim
@@ -0,0 +1,28 @@
+" Vim compiler file
+" Compiler:	Haml
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2013 May 30
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "haml"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=haml\ -c
+
+CompilerSet errorformat=
+      \Haml\ %trror\ on\ line\ %l:\ %m,
+      \Syntax\ %trror\ on\ line\ %l:\ %m,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2:
--- a/runtime/compiler/javac.vim
+++ b/runtime/compiler/javac.vim
@@ -1,8 +1,7 @@
 " Vim compiler file
-" Compiler:     javac
-" Maintainer:   Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/javac.vim
-" Last Change:  2004 Nov 27
+" Compiler:	javac
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2004 Nov 27

 if exists("current_compiler")
  finish
--- a/runtime/compiler/msvc.vim
+++ b/runtime/compiler/msvc.vim
@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:	Miscrosoft Visual C
+" Compiler:	Microsoft Visual C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Nov 30
+" Last Change:	2014 Sep 20

 if exists("current_compiler")
  finish
--- a/runtime/compiler/ocaml.vim
+++ b/runtime/compiler/ocaml.vim
@@ -0,0 +1,44 @@
+" Vim Compiler File
+" Compiler:	ocaml
+" Maintainer:	See ftplugin/ocaml.vim (?)
+" Last Change:	June 2013 by Marc Weber
+"
+" Marc Weber's comments:
+" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
+" ocamake and whatnot. So which one to use?
+"
+" This error format was moved from ftplugin/ocaml.vim to this file,
+" because ftplugin is the wrong file to set an error format
+" and the error format itself is annoying because it joins many lines in this
+" error case:
+"
+"    Error: The implementation foo.ml does not match the interface foo.cmi:
+"    Modules do not match case.
+"
+" So having it here makes people opt-in
+
+
+if exists("current_compiler")
+    finish
+endif
+let current_compiler = "ocaml"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet errorformat =
+      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
+      \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
+      \%+EReference\ to\ unbound\ regexp\ name\ %m,
+      \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
+      \%Wocamlyacc:\ w\ -\ %m,
+      \%-Zmake%.%#,
+      \%C%m,
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
+      \%D%*\\a:\ Entering\ directory\ `%f',
+      \%X%*\\a:\ Leaving\ directory\ `%f',
+      \%DMaking\ %*\\a\ in\ %f
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/compiler/php.vim
+++ b/runtime/compiler/php.vim
@@ -1,8 +1,7 @@
 " Vim compiler file
-" Compiler:	PHP
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/php.vim
-" Last Change:	2004 Nov 27
+" Compiler:	PHP CLI
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 25

 if exists("current_compiler")
  finish
@@ -17,12 +16,11 @@ let s:cpo_save = &cpo
 set cpo-=C

 CompilerSet makeprg=php\ -lq
-
-CompilerSet errorformat=%E<b>Parse\ error</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
-		       \%W<b>Notice</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
-		       \%EParse\ error:\ %m\ in\ %f\ on\ line\ %l,
-		       \%WNotice:\ %m\ in\ %f</b>\ on\ line\ %l,
-		       \%-G%.%#
+CompilerSet errorformat=%E<b>%.%#Parse\ error</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
+		    \%W<b>%.%#Notice</b>:\ %m\ in\ <b>%f</b>\ on\ line\ <b>%l</b><br\ />,
+		    \%E%.%#Parse\ error:\ %m\ in\ %f\ on\ line\ %l,
+		    \%W%.%#Notice:\ %m\ in\ %f\ on\ line\ %l,
+		    \%-G%.%#

 let &cpo = s:cpo_save
 unlet s:cpo_save
--- a/runtime/compiler/rake.vim
+++ b/runtime/compiler/rake.vim
@@ -0,0 +1,35 @@
+" Vim compiler file
+" Language:		Rake
+" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
+" URL:			https://github.com/vim-ruby/vim-ruby
+" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "rake"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=rake
+
+CompilerSet errorformat=
+      \%D(in\ %f),
+      \%\\s%#from\ %f:%l:%m,
+      \%\\s%#from\ %f:%l:,
+      \%\\s%##\ %f:%l:%m,
+      \%\\s%##\ %f:%l,
+      \%\\s%#[%f:%l:\ %#%m,
+      \%\\s%#%f:%l:\ %#%m,
+      \%\\s%#%f:%l:,
+      \%m\ [%f:%l]:
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8:
--- a/runtime/compiler/rspec.vim
+++ b/runtime/compiler/rspec.vim
@@ -1,9 +1,7 @@
 " Vim compiler file
 " Language:		RSpec
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:		2009 Dec 22
-" URL:			http://vim-ruby.rubyforge.org
-" Anon CVS:		See above site
+" URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>

 if exists("current_compiler")
@@ -18,21 +16,15 @@ endif
 let s:cpo_save = &cpo
 set cpo-=C

-CompilerSet makeprg=spec
+CompilerSet makeprg=rspec

 CompilerSet errorformat=
-    \%+W'%.%#'\ FAILED,
-    \%+I'%.%#'\ FIXED,
-    \%-Cexpected:%.%#,
-    \%-C\ \ \ \ \ got:%.%#,
+    \%f:%l:\ %tarning:\ %m,
    \%E%.%#:in\ `load':\ %f:%l:%m,
-    \%C%f:%l:,
-    \%W%f:%l:\ warning:\ %m,
-    \%E%f:%l:in\ %*[^:]:\ %m,
-    \%E%f:%l:\ %m,
-    \%-Z%\tfrom\ %f:%l,
-    \%-Z%p^%.%#,
-    \%-C%.%#,
+    \%E%f:%l:in\ `%*[^']':\ %m,
+    \%-Z\ \ \ \ \ \#\ %f:%l:%.%#,
+    \%E\ \ %\\d%\\+)%.%#,
+    \%C\ \ \ \ \ %m,
    \%-G%.%#

 let &cpo = s:cpo_save
--- a/runtime/compiler/ruby.vim
+++ b/runtime/compiler/ruby.vim
@@ -1,33 +1,10 @@
 " Vim compiler file
 " Language:		Ruby
 " Function:		Syntax check and/or error reporting
-" Maintainer:		Tim Hammerquist <timh at rubyforge.org>
-" Last Change:		2008 Aug 1
-" URL:			http://vim-ruby.rubyforge.org
-" Anon CVS:		See above site
+" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
+" URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
 " ----------------------------------------------------------------------------
-"
-" Changelog:
-" 0.2:	script saves and restores 'cpoptions' value to prevent problems with
-"	line continuations
-" 0.1:	initial release
-"
-" Contributors:
-"   Hugh Sasse <hgs@dmu.ac.uk>
-"   Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-"
-" Todo:
-"   match error type %m
-"
-" Comments:
-"   I know this file isn't perfect.  If you have any questions, suggestions,
-"   patches, etc., please don't hesitate to let me know.
-"
-"   This is my first experience with 'errorformat' and compiler plugins and
-"   I welcome any input from more experienced (or clearer-thinking)
-"   individuals.
-" ----------------------------------------------------------------------------

 if exists("current_compiler")
  finish
--- a/runtime/compiler/rubyunit.vim
+++ b/runtime/compiler/rubyunit.vim
@@ -1,9 +1,7 @@
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2008 Aug 1
-" URL:			http://vim-ruby.rubyforge.org
-" Anon CVS:		See above site
+" URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>

 if exists("current_compiler")
--- a/runtime/compiler/sass.vim
+++ b/runtime/compiler/sass.vim
@@ -0,0 +1,30 @@
+" Vim compiler file
+" Compiler:	Sass
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2013 May 30
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "sass"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=sass\ -c
+
+CompilerSet errorformat=
+      \%f:%l:%m\ (Sass::Syntax%trror),
+      \%ESyntax\ %trror:%m,
+      \%C%\\s%\\+on\ line\ %l\ of\ %f,
+      \%Z%.%#,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2:
--- a/runtime/compiler/se.vim
+++ b/runtime/compiler/se.vim
@@ -1,8 +1,7 @@
 " Vim compiler file
-" Compiler:	se (SmartEiffel Compiler)
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/se.vim
-" Last Change:	2004 Nov 27
+" Compiler:	se (Liberty Eiffel Compiler)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 29

 if exists("current_compiler")
  finish
@@ -16,12 +15,15 @@ endif
 let s:cpo_save = &cpo
 set cpo-=C

-CompilerSet makeprg=compile\ %
+CompilerSet makeprg=se\ c

 CompilerSet errorformat=%W******\ Warning:\ %m,
 		    \%E******\ Fatal\ Error:\ %m,
 		    \%E******\ Error:\ %m,
-		    \%CLine\ %l\ column\ %c\ in\ %\\w%\\+\ (%f)\ :,
+		    \%ZLine\ %l\ column\ %c\ in\ %.%#\ (%f)\ %\\=:,
+		    \%ZLine\ %l\ columns\ %c\\,\ %\\d%\\+\ %.%#\ (%f)\ %\\=:,
+		    \%+C%*[^\ ]%.%#,
+		    \%-GThe\ source\ lines\ involved,
 		    \%-G%.%#

 let &cpo = s:cpo_save
--- a/runtime/compiler/tcl.vim
+++ b/runtime/compiler/tcl.vim
@@ -1,7 +1,6 @@
 " Vim compiler file
 " Compiler:	tcl
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/tcl.vim
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2004 Nov 27

 if exists("current_compiler")
--- a/runtime/compiler/tidy.vim
+++ b/runtime/compiler/tidy.vim
@@ -1,11 +1,7 @@
 " Vim compiler file
 " Compiler:	HTML Tidy
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/tidy.vim
-" Last Change:	2004 Nov 27
-
-" NOTE: set 'tidy_compiler_040800' if you are using the 4th August 2000 release
-"       of HTML Tidy.
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jul 7

 if exists("current_compiler")
  finish
@@ -16,13 +12,7 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
 endif

-" this is needed to work around a bug in the 04/08/00 release of tidy which
-" failed to set the filename if the -quiet option was used
-if exists("tidy_compiler_040800")
-  CompilerSet makeprg=tidy\ -errors\ --gnu-emacs\ yes\ %
-else
-  CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %
-endif
+CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %

 " sample warning: foo.html:8:1: Warning: inserting missing 'foobar' element
 " sample error:   foo.html:9:2: Error: <foobar> is not recognized!
--- a/runtime/compiler/xmllint.vim
+++ b/runtime/compiler/xmllint.vim
@@ -1,8 +1,7 @@
 " Vim compiler file
 " Compiler:	xmllint
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/xmllint.vim
-" Last Change:	2004 Nov 27
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jul 8

 if exists("current_compiler")
  finish
@@ -16,12 +15,10 @@ endif
 let s:cpo_save = &cpo
 set cpo-=C

-CompilerSet makeprg=xmllint\ --valid\ --noout\ 
+CompilerSet makeprg=xmllint\ --valid\ --noout

-CompilerSet errorformat=%E%f:%l:\ error:\ %m,
-		    \%W%f:%l:\ warning:\ %m,
-		    \%E%f:%l:\ validity\ error:\ %m,
-		    \%W%f:%l:\ validity\ warning:\ %m,
+CompilerSet errorformat=%+E%f:%l:\ %.%#\ error\ :\ %m,
+		    \%+W%f:%l:\ %.%#\ warning\ :\ %m,
 		    \%-Z%p^,
 		    \%-G%.%#

--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -75,6 +75,7 @@ DOCS = \
 	pattern.txt \
 	pi_getscript.txt \
 	pi_gzip.txt \
+	pi_logipat.txt \
 	pi_netrw.txt \
 	pi_paren.txt \
 	pi_spec.txt \
@@ -207,6 +208,7 @@ HTMLS = \
 	pattern.html \
 	pi_getscript.html \
 	pi_gzip.html \
+	pi_logipat.html \
 	pi_netrw.html \
 	pi_paren.html \
 	pi_spec.html \
@@ -229,7 +231,6 @@ HTMLS = \
 	starting.html \
 	syntax.html \
 	tabpage.html \
-	tags.html \
 	tagsrch.html \
 	term.html \
 	tips.html \
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 7.3.  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.3.  Last change: 2013 May 19
+*autocmd.txt*   For Vim version 7.4.  Last change: 2015 Dec 05


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -259,6 +259,7 @@ Name			triggered by ~
 |Syntax|		when the 'syntax' option has been set
 |EncodingChanged|	after the 'encoding' option has been changed
 |TermChanged|		after the value of 'term' has changed
+|OptionSet|		after setting any option

 	Startup and exit
 |VimEnter|		after doing all the startup stuff
@@ -278,6 +279,7 @@ Name			triggered by ~
 |ShellCmdPost|		after executing a shell command
 |ShellFilterPost|	after filtering with a shell command

+|CmdUndefined|		a user command is used but it isn't defined
 |FuncUndefined|		a user function is used but it isn't defined
 |SpellFileMissing|	a spell file is used but it can't be found
 |SourcePre|		before sourcing a Vim script
@@ -304,6 +306,9 @@ Name			triggered by ~
 |InsertCharPre|		when a character was typed in Insert mode, before
 			inserting it

+|TextChanged|		after a change was made to the text in Normal mode
+|TextChangedI|		after a change was made to the text in Insert mode
+
 |ColorScheme|		after loading a color scheme

 |RemoteReply|		a reply from a server Vim was received
@@ -462,6 +467,16 @@ BufWriteCmd			Before writing the whole buffer to a file.
 							*BufWritePost*
 BufWritePost			After writing the whole buffer to a file
 				(should undo the commands for BufWritePre).
+							*CmdUndefined*
+CmdUndefined			When a user command is used but it isn't
+				defined.  Useful for defining a command only
+				when it's used.  The pattern is matched
+				against the command name.  Both <amatch> and
+				<afile> are set to the name of the command.
+				NOTE: Autocompletion won't work until the
+				command is defined.  An alternative is to
+				always define the user command and have it
+				invoke an autoloaded function.  See |autoload|.
 							*CmdwinEnter*
 CmdwinEnter			After entering the command-line window.
 				Useful for setting options specifically for
@@ -480,11 +495,19 @@ CmdwinLeave			Before leaving the command-line window.
 				|cmdwin-char|
 							*ColorScheme*
 ColorScheme			After loading a color scheme. |:colorscheme|
+				The pattern is matched against the
+				colorscheme name. <afile> can be used for the
+				name of the actual file where this option was
+				set, and <amatch> for the new colorscheme
+				name.
+

 							*CompleteDone*
 CompleteDone			After Insert mode completion is done.  Either
 				when something was completed or abandoning
 				completion. |ins-completion|
+				The |v:completed_item| variable contains
+				information about the completed item.

 							*CursorHold*
 CursorHold			When the user doesn't press a key for the time
@@ -499,6 +522,11 @@ CursorHold			When the user doesn't press a key for the time
 				operator.
 				While recording the CursorHold event is not
 				triggered. |q|
+							*<CursorHold>*
+				Internally the autocommand is triggered by the
+				<CursorHold> key. In an expression mapping
+				|getchar()| may see this character.
+
 				Note: Interactive commands cannot be used for
 				this event.  There is no hit-enter prompt,
 				the screen is updated directly (when needed).
@@ -513,9 +541,9 @@ CursorHold			When the user doesn't press a key for the time
 CursorHoldI			Just like CursorHold, but in Insert mode.

 							*CursorMoved*
-CursorMoved			After the cursor was moved in Normal mode.
-				Also when the text of the cursor line has been
-				changed, e.g., with "x", "rx" or "p".
+CursorMoved			After the cursor was moved in Normal or Visual
+				mode.  Also when the text of the cursor line
+				has been changed, e.g., with "x", "rx" or "p".
 				Not triggered when there is typeahead or when
 				an operator is pending.
 				For an example see |match-parens|.
@@ -553,11 +581,15 @@ FileChangedRO			Before making the first change to a read-only
 				It is not allowed to change to another buffer
 				here.  You can reload the buffer but not edit
 				another one.
+							*E881*
+				If the number of lines changes saving for undo
+				may fail and the change will be aborted.
 							*FileChangedShell*
 FileChangedShell		When Vim notices that the modification time of
 				a file has changed since editing started.
 				Also when the file attributes of the file
-				change. |timestamp|
+				change or when the size of the file changes.
+				|timestamp|
 				Mostly triggered after executing a shell
 				command, but also with a |:checktime| command
 				or when Gvim regains input focus.
@@ -657,6 +689,8 @@ FuncUndefined			When a user function is used but it isn't
 				when it's used.  The pattern is matched
 				against the function name.  Both <amatch> and
 				<afile> are set to the name of the function.
+				NOTE: When writing Vim scripts a better
+				alternative is to use an autoloaded function.
 				See |autoload-functions|.
 							*GUIEnter*
 GUIEnter			After starting the GUI successfully, and after
@@ -711,6 +745,29 @@ MenuPopup			Just before showing the popup menu (under the
 					o	Operator-pending
 					i	Insert
 					c	Command line
+							*OptionSet*
+OptionSet			After setting an option.  The pattern is
+				matched against the long option name.
+				The |v:option_old| variable indicates the
+				old option value, |v:option_new| variable
+				indicates the newly set value, the
+				|v:option_type| variable indicates whether
+				it's global or local scoped and |<amatch>|
+				indicates what option has been set.
+
+				Is not triggered on startup and for the 'key'
+				option for obvious reasons.
+
+				Usage example: Check for the existence of the
+				directory in the 'backupdir' and 'undodir'
+				options, create the directory if it doesn't
+				exist yet.
+
+				Note: It's a bad idea to reset an option
+				during this autocommand, this may break a
+				plugin. You can always use `:noa` to prevent
+				triggering this autocommand.
+
 							*QuickFixCmdPre*
 QuickFixCmdPre			Before a quickfix command is run (|:make|,
 				|:lmake|, |:grep|, |:lgrep|, |:grepadd|,
@@ -731,7 +788,7 @@ QuickFixCmdPost			Like QuickFixCmdPre, but after a quickfix
 				command is run, before jumping to the first
 				location. For |:cfile| and |:lfile| commands
 				it is run after error file is read and before
-				moving to the first error. 
+				moving to the first error.
 				See |QuickFixCmdPost-example|.
 							*QuitPre*
 QuitPre				When using `:quit`, `:wq` or `:qall`, before
@@ -902,6 +959,13 @@ WinLeave			Before leaving a window.  If the window to be
 ==============================================================================
 6. Patterns					*autocmd-patterns* *{pat}*

+The {pat} argument can be a comma separated list.  This works as if the
+command was given with each pattern separately.  Thus this command: >
+	:autocmd BufRead *.txt,*.info set et
+Is equivalent to: >
+	:autocmd BufRead *.txt set et
+	:autocmd BufRead *.info set et
+
 The file pattern {pat} is tested for a match against the file name in one of
 two ways:
 1. When there is no '/' in the pattern, Vim checks for a match against only
@@ -952,7 +1016,8 @@ the autocommand is executed.  This is different from the command!

 							*file-pattern*
 The pattern is interpreted like mostly used in file names:
-	*	matches any sequence of characters
+	*	matches any sequence of characters; Unusual: includes path
+		separators
 	?	matches any single character
 	\?	matches a '?'
 	.	matches a '.'
@@ -961,6 +1026,9 @@ The pattern is interpreted like mostly used in file names:
 	\,	matches a ','
 	{ }	like \( \) in a |pattern|
 	,	inside { }: like \| in a |pattern|
+	\}	literal }
+	\{	literal {
+	\\\{n,m\}  like \{n,m} in a |pattern|
 	\	special meaning like in a |pattern|
 	[ch]	matches 'c' or 'h'
 	[^ch]   match any character but 'c' and 'h'
@@ -1004,7 +1072,7 @@ Instead of a pattern buffer-local autocommands use one of these forms:
 Examples: >
    :au CursorHold <buffer>  echo 'hold'
    :au CursorHold <buffer=33>  echo 'hold'
-    :au CursorHold <buffer=abuf>  echo 'hold'
+    :au BufNewFile * au CursorHold <buffer=abuf>  echo 'hold'

 All the commands for autocommands also work with buffer-local autocommands,
 simply use the special string instead of the pattern.  Examples: >
@@ -1063,6 +1131,9 @@ name!
 :aug[roup] {name}		Define the autocmd group name for the
 				following ":autocmd" commands.  The name "end"
 				or "END" selects the default group.
+				To avoid confusion, the name should be
+				different from existing {event} names, as this
+				most likely will not do what you intended.

 						*:augroup-delete* *E367*
 :aug[roup]! {name}		Delete the autocmd group {name}.  Don't use
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.3.  Last change: 2013 Mar 19
+*change.txt*    For Vim version 7.4.  Last change: 2015 Oct 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -71,9 +71,21 @@ For inserting text see |insert.txt|.
 			"D" deletes the highlighted text plus all text until
 			the end of the line.  {not in Vi}

-					*:d* *:de* *:del* *:delete* *:dl*
+					*:d* *:de* *:del* *:delete* *:dl* *:dp*
 :[range]d[elete] [x]	Delete [range] lines (default: current line) [into
 			register x].
+			Note these weird abbreviations:
+			   :dl		delete and list
+			   :dell	idem
+			   :delel	idem
+			   :deletl	idem
+			   :deletel	idem
+			   :dp		delete and print
+			   :dep		idem
+			   :delp	idem
+			   :delep	idem
+			   :deletp	idem
+			   :deletep	idem

 :[range]d[elete] [x] {count}
 			Delete {count} lines, starting with [range]
@@ -144,6 +156,9 @@ only after a '.').
 The 'B' and 'M' flags in 'formatoptions' change the behavior for inserting
 spaces before and after a multi-byte character |fo-table|.

+The '[ mark is set at the end of the first line that was joined, '] at the end
+of the resulting line.
+

 ==============================================================================
 2. Delete and insert				*delete-insert* *replacing*
@@ -364,10 +379,43 @@ Adding and subtracting ~
 CTRL-A			Add [count] to the number or alphabetic character at
 			or after the cursor.  {not in Vi}

+							*v_CTRL-A*
+{Visual}CTRL-A		Add [count] to the number or alphabetic character in
+			the highlighted text.  {not in Vi}
+
+							*v_g_CTRL-A*
+{Visual}g CTRL-A	Add [count] to the number or alphabetic character in
+			the highlighted text. If several lines are
+		        highlighted, each one will be incremented by an
+			additional [count] (so effectively creating a
+			[count] incrementing sequence).  {not in Vi}
+			For Example, if you have this list of numbers:
+				1. ~
+				1. ~
+				1. ~
+				1. ~
+			Move to the second "1." and Visually select three
+			lines, pressing g CTRL-A results in:
+				1. ~
+				2. ~
+				3. ~
+				4. ~
+
 							*CTRL-X*
 CTRL-X			Subtract [count] from the number or alphabetic
 			character at or after the cursor.  {not in Vi}

+							*v_CTRL-X*
+{Visual}CTRL-X		Subtract [count] from the number or alphabetic
+			character in the highlighted text.  {not in Vi}
+
+							*v_g_CTRL-X*
+{Visual}g CTRL-X	Subtract [count] from the number or alphabetic
+			character in the highlighted text. If several lines
+			are highlighted, each value will be decremented by an
+			additional [count] (so effectively creating a [count]
+			decrementing sequence).  {not in Vi}
+
 The CTRL-A and CTRL-X commands work for (signed) decimal numbers, unsigned
 octal and hexadecimal numbers and alphabetic characters.  This depends on the
 'nrformats' option.
@@ -384,6 +432,10 @@ octal and hexadecimal numbers and alphabetic characters.  This depends on the
  under or after the cursor.  This is useful to make lists with an alphabetic
  index.

+For decimals a leading negative sign is considered for incrementing/
+decrementing, for octal and hex values, it won't be considered.
+To ignore the sign Visually select the number before using CTRL-A or CTRL-X. 
+
 For numbers with leading zeros (including all octal and hexadecimal numbers),
 Vim preserves the number of characters in the number when possible.  CTRL-A on
 "0077" results in "0100", CTRL-X on "0x100" results in "0x0ff".
@@ -463,8 +515,8 @@ If the 'shiftround' option is on, the indent is rounded to a multiple of
 'shiftwidth'.

 If the 'smartindent' option is on, or 'cindent' is on and 'cinkeys' contains
-'#', shift right does not affect lines starting with '#' (these are supposed
-to be C preprocessor lines that must stay in column 1).
+'#' with a zero value, shift right does not affect lines starting with '#'
+(these are supposed to be C preprocessor lines that must stay in column 1).

 When the 'expandtab' option is off (this is the default) Vim uses <Tab>s as
 much as possible to make the indent.  You can use ">><<" to replace an indent
@@ -582,9 +634,9 @@ For other systems the tmpnam() library function is used.
 			may add [flags], see |:s_flags|.
 			Note that after `:substitute` the '&' flag can't be
 			used, it's recognized as a pattern separator.
-			The space between `:substitute` and the 'c', 'g' and
-			'r' flags isn't required, but in scripts it's a good
-			idea to keep it to avoid confusion.
+			The space between `:substitute` and the 'c', 'g',
+			'i', 'I' and 'r' flags isn't required, but in scripts
+			it's a good idea to keep it to avoid confusion.

 :[range]~[&][flags] [count]					*:~*
 			Repeat last substitute with same substitute string
@@ -811,8 +863,38 @@ either the first or second pattern in parentheses did not match, so either
  :s/\([ab]\)\|\([cd]\)/\1x/g   modifies "a b c d"  to "ax bx x x"
 <

+		*:sc* *:sce* *:scg* *:sci* *:scI* *:scl* *:scp* *:sg* *:sgc*
+		*:sge* *:sgi* *:sgI* *:sgl* *:sgn* *:sgp* *:sgr* *:sI* *:si*
+		*:sic* *:sIc* *:sie* *:sIe* *:sIg* *:sIl* *:sin* *:sIn* *:sIp*
+		*:sip* *:sIr* *:sir* *:sr* *:src* *:srg* *:sri* *:srI* *:srl*
+		*:srn* *:srp*
+2-letter and 3-letter :substitute commands ~
+
+     List of :substitute commands
+     |      c    e    g    i    I    n    p    l    r
+     | c  :sc  :sce :scg :sci :scI :scn :scp :scl  ---
+     | e
+     | g  :sgc :sge :sg  :sgi :sgI :sgn :sgp :sgl :sgr
+     | i  :sic :sie  --- :si  :siI :sin :sip  --- :sir
+     | I  :sIc :sIe :sIg :sIi :sI  :sIn :sIp :sIl :sIr
+     | n
+     | p
+     | l
+     | r  :src  --- :srg :sri :srI :srn :srp :srl :sr
+
+Exceptions:
+     :scr  is  `:scriptnames`
+     :se   is  `:set`
+     :sig  is  `:sign`
+     :sil  is  `:silent`
+     :sn   is  `:snext`
+     :sp   is  `:split`
+     :sl   is  `:sleep`
+     :sre  is  `:srewind`
+
+
 Substitute with an expression			*sub-replace-expression*
-						*sub-replace-\=*
+						*sub-replace-\=* *s/\=*
 When the substitute string starts with "\=" the remainder is interpreted as an
 expression.  This does not work recursively: a |substitute()| function inside
 the expression cannot use "\=" for the substitute string.
@@ -1057,6 +1139,11 @@ another register.  E.g., yank the text to copy, Visually select the text to
 replace and use "0p .  You can repeat this as many times as you like, the
 unnamed register will be changed each time.

+When you use a blockwise Visual mode command and yank only a single line into
+a register, a paste on a visual selected area will paste that single line on
+each of the selected lines (thus replacing the blockwise selected region by a
+block of the pasted line).
+
 							*blockwise-register*
 If you use a blockwise Visual mode command to get the text into the register,
 the block of text will be inserted before ("P") or after ("p") the cursor
@@ -1078,16 +1165,17 @@ Rationale:	In Vi the "y" command followed by a backwards motion would
 With a linewise yank command the cursor is put in the first line, but the
 column is unmodified, thus it may not be on the first yanked character.

-There are nine types of registers:			*registers* *E354*
+There are ten types of registers:			*registers* *E354*
 1. The unnamed register ""
 2. 10 numbered registers "0 to "9
 3. The small delete register "-
 4. 26 named registers "a to "z or "A to "Z
-5. four read-only registers ":, "., "% and "#
-6. the expression register "=
-7. The selection and drop registers "*, "+ and "~ 
-8. The black hole register "_
-9. Last search pattern register "/
+5. three read-only registers ":, "., "%
+6. alternate buffer register "#
+7. the expression register "=
+8. The selection and drop registers "*, "+ and "~ 
+9. The black hole register "_
+10. Last search pattern register "/

 1. Unnamed register ""				*quote_quote* *quotequote*
 Vim fills this register with text deleted with the "d", "c", "s", "x" commands
@@ -1114,6 +1202,8 @@ less than one line (the small delete register is used then).  An exception is
 made for the delete operator with these movement commands: |%|, |(|, |)|, |`|,
 |/|, |?|, |n|, |N|, |{| and |}|.  Register "1 is always used then (this is Vi
 compatible).  The "- register is used as well if the delete is within a line.
+Note that these characters may be mapped.  E.g. |%| is mapped by the matchit
+plugin.
   With each successive deletion or change, Vim shifts the previous contents
 of register 1 into register 2, 2 into 3, and so forth, losing the previous
 contents of register 9.
@@ -1131,7 +1221,7 @@ letters to replace their previous contents or as uppercase letters to append
 to their previous contents.  When the '>' flag is present in 'cpoptions' then
 a line break is inserted before the appended text.

-5. Read-only registers ":, "., "% and "#
+5. Read-only registers ":, ". and "%
 These are '%', '#', ':' and '.'.  You can use them only with the "p", "P",
 and ":put" commands and with CTRL-R.  {not in Vi}
 						*quote_.* *quote.* *E29*
@@ -1142,8 +1232,6 @@ and ":put" commands and with CTRL-R.  {not in Vi}
 		('textwidth' and other options affect what is inserted).
 							*quote_%* *quote%*
 	"%	Contains the name of the current file.
-							*quote_#* *quote#*
-	"#	Contains the name of the alternate file.
 						*quote_:* *quote:* *E30*
 	":	Contains the most recent executed command-line.  Example: Use
 		"@:" to repeat the previous command-line command.
@@ -1152,16 +1240,33 @@ and ":put" commands and with CTRL-R.  {not in Vi}
 		the command was completely from a mapping.
 		{not available when compiled without the |+cmdline_hist|
 		feature}
+							*quote_#* *quote#*
+6. Alternate file register "#
+Contains the name of the alternate file for the current window.  It will
+change how the |CTRL-^| command works.
+This register is writable, mainly to allow for restoring it after a plugin has
+changed it.  It accepts buffer number: >
+    let altbuf = bufnr(@#)
+    ...
+    let @# = altbuf
+It will give error |E86| if you pass buffer number and this buffer does not
+exist.
+It can also accept a match with an existing buffer name: >
+    let @# = 'buffer_name'
+Error |E93| if there is more than one buffer matching the given name or |E94|
+if none of buffers matches the given name.

-6. Expression register "=			*quote_=* *quote=* *@=*
+7. Expression register "=			*quote_=* *quote=* *@=*
 This is not really a register that stores text, but is a way to use an
 expression in commands which use a register.  The expression register is
-read-only; you cannot put text into it.  After the '=', the cursor moves to
-the command-line, where you can enter any expression (see |expression|).  All
-normal command-line editing commands are available, including a special
-history for expressions.  When you end the command-line by typing <CR>, Vim
-computes the result of the expression.  If you end it with <Esc>, Vim abandons
-the expression.  If you do not enter an expression, Vim uses the previous
+read-write.
+
+When typing the '=' after " or CTRL-R the cursor moves to the command-line,
+where you can enter any expression (see |expression|).  All normal
+command-line editing commands are available, including a special history for
+expressions.  When you end the command-line by typing <CR>, Vim computes the
+result of the expression.  If you end it with <Esc>, Vim abandons the
+expression.  If you do not enter an expression, Vim uses the previous
 expression (like with the "/" command).

 The expression must evaluate to a String.  A Number is always automatically
@@ -1174,7 +1279,7 @@ If the "= register is used for the "p" command, the String is split up at <NL>
 characters.  If the String ends in a <NL>, it is regarded as a linewise
 register.  {not in Vi}

-7. Selection and drop registers "*, "+ and "~ 
+8. Selection and drop registers "*, "+ and "~ 
 Use these registers for storing and retrieving the selected text for the GUI.
 See |quotestar| and |quoteplus|.  When the clipboard is not available or not
 working, the unnamed register is used instead.  For Unix systems the clipboard
@@ -1196,17 +1301,17 @@ GTK GUI}
 Note: The "~ register is only used when dropping plain text onto Vim.
 Drag'n'drop of URI lists is handled internally.

-8. Black hole register "_				*quote_*
+9. Black hole register "_				*quote_*
 When writing to this register, nothing happens.  This can be used to delete
 text without affecting the normal registers.  When reading from this register,
 nothing is returned.  {not in Vi}

-9. Last search pattern register	"/			*quote_/* *quote/*
+10. Last search pattern register	"/			*quote_/* *quote/*
 Contains the most recent search-pattern.  This is used for "n" and 'hlsearch'.
 It is writable with `:let`, you can change it to have 'hlsearch' highlight
 other matches without actually searching.  You can't yank or delete into this
 register.  The search direction is available in |v:searchforward|.
-Note that the valued is restored when returning from a function
+Note that the value is restored when returning from a function
 |function-search-undo|.
 {not in Vi}

@@ -1421,10 +1526,10 @@ When you hit Return in a C-comment, Vim will insert the middle comment leader
 for the new line: " * ".  To close this comment you just have to type "/"
 before typing anything else on the new line.  This will replace the
 middle-comment leader with the end-comment leader and apply any specified
-alignment, leaving just " */".  There is no need to hit BackSpace first.
+alignment, leaving just " */".  There is no need to hit Backspace first.

-When there is a match with a middle part, but there also is a maching end part
-which is longer, the end part is used.  This makes a C style comment work
+When there is a match with a middle part, but there also is a matching end
+part which is longer, the end part is used.  This makes a C style comment work
 without requiring the middle part to end with a space.

 Here is an example of alignment flags at work to make a comment stand out
@@ -1628,7 +1733,7 @@ And a few warnings:
 7. Sorting text						*sorting*

 Vim has a sorting function and a sorting command.  The sorting function can be
-found here: |sort()|.
+found here: |sort()|, |uniq()|.

 							*:sor* *:sort*
 :[range]sor[t][!] [i][u][r][n][x][o] [/{pattern}/]
@@ -1695,8 +1800,8 @@ Note that using `:sort` with `:global` doesn't sort the matching lines, it's
 quite useless.

 The details about sorting depend on the library function used.  There is no
-guarantee that sorting is "stable" or obeys the current locale.  You will have
-to try it out.
+guarantee that sorting obeys the current locale.  You will have to try it out.
+Vim does do a "stable" sort.

 The sorting can be interrupted, but if you interrupt it too late in the
 process you may end up with duplicated lines.  This also depends on the system
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.3.  Last change: 2013 Mar 16
+*cmdline.txt*   For Vim version 7.4.  Last change: 2015 Dec 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -56,7 +56,7 @@ history tables:
 These are completely separate.  Each history can only be accessed when
 entering the same type of line.
 Use the 'history' option to set the number of lines that are remembered
-(default: 20).
+(default: 50).
 Notes:
 - When you enter a command-line that is exactly the same as an older one, the
  old one is removed (to avoid repeated commands moving older commands out of
@@ -101,6 +101,11 @@ CTRL-E or <End>					*c_CTRL-E* *c_<End>* *c_End*
 							*c_<LeftMouse>*
 <LeftMouse>	Move the cursor to the position of the mouse click.

+							*c_<MiddleMouse>*
+<MiddleMouse>	Paste the contents of the clipboard (for X11 the primary
+		selection).  This is similar to using CTRL-R *, but no CR
+		characters are inserted between lines.
+
 CTRL-H						*c_<BS>* *c_CTRL-H* *c_BS*
 <BS>		Delete the character in front of the cursor (see |:fixdel| if
 		your <BS> key does not do what you want).
@@ -356,6 +361,10 @@ terminals)
 		List the recent five entries from all histories: >
 			:history all -5,

+:keepp[atterns] {command}			*:keepp* *:keeppatterns*
+		Execute {command}, without adding anything to the search
+		history
+
 ==============================================================================
 2. Command-line completion				*cmdline-completion*

@@ -507,6 +516,8 @@ followed by another Vim command:
    :argdo
    :autocmd
    :bufdo
+    :cdo
+    :cfdo
    :command
    :cscope
    :debug
@@ -517,6 +528,8 @@ followed by another Vim command:
    :help
    :helpfind
    :lcscope
+    :ldo
+    :lfdo
    :make
    :normal
    :perl
@@ -593,6 +606,7 @@ starts editing the three files "foo bar", "goes to" and "school ".
 When you want to use the special characters '"' or '|' in a command, or want
 to use '%' or '#' in a file name, precede them with a backslash.  The
 backslash is not required in a range and in the ":substitute" command.
+See also |`=|.

 							*:_!*
 The '!' (bang) character after an Ex command makes the command behave in a
@@ -745,15 +759,16 @@ to insert special things while typing you can use the CTRL-R command.  For
 example, "%" stands for the current file name, while CTRL-R % inserts the
 current file name right away.  See |c_CTRL-R|.

-Note: If you want to avoid the special characters in a Vim script you may want
-to use |fnameescape()|.
+Note:  If you want to avoid the effects of special characters in a Vim script
+you may want to use |fnameescape()|.  Also see |`=|.


 In Ex commands, at places where a file name can be used, the following
 characters have a special meaning.  These can also be used in the expression
-function expand() |expand()|.
+function |expand()|.
 	%	Is replaced with the current file name.		  *:_%* *c_%*
 	#	Is replaced with the alternate file name.	  *:_#* *c_#*
+		This is remembered for every window.
 	#n	(where n is a number) is replaced with		  *:_#0* *:_#n*
 		the file name of buffer n.  "#0" is the same as "#".     *c_#n*
 	##	Is replaced with all names in the argument list	  *:_##* *c_##*
@@ -785,6 +800,7 @@ it, no matter how many backslashes.
 	   #			alternate.file
 	   \#			#
 	   \\#			\#
+Also see |`=|.

 			       *:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
 			       *:<sfile>* *<sfile>* *:<afile>* *<afile>*
@@ -806,21 +822,21 @@ Note: these are typed literally, they are not special keys!
 		   <afile> only when the file name isn't used to match with
 		   (for FileType, Syntax and SpellFileMissing events).
 	<sfile>    When executing a ":source" command, is replaced with the
-		   file name of the sourced file.  *E498* 
-		   When executing a function, is replaced with
-		   "function {function-name}"; function call nesting is
-		   indicated like this:
-		   "function {function-name1}..{function-name2}".  Note that
-		   filename-modifiers are useless when <sfile> is used inside
-		   a function.
+		   file name of the sourced file.  *E498*
+		   When executing a function, is replaced with:
+		   "function {function-name}[{lnum}]"
+		   function call nesting is indicated like this:
+		   "function {function-name1}[{lnum}]..{function-name2}[{lnum}]"
+		   Note that filename-modifiers are useless when <sfile> is
+		   used inside a function.
 	<slnum>	   When executing a ":source" command, is replaced with the
 	           line number.  *E842*
 		   When executing a function it's the line number relative to
 		   the start of the function.

 							 *filename-modifiers*
-	 *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs*
-	        *%:8* *%:p* *%:.* *%:~* *%:h* *%:t* *%:r* *%:e* *%:s* *%:gs*
+*:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs* *::S*
+     *%:8* *%:p* *%:.* *%:~* *%:h* *%:t* *%:r* *%:e* *%:s* *%:gs* *%:S*
 The file name modifiers can be used after "%", "#", "#n", "<cfile>", "<sfile>",
 "<afile>" or "<abuf>".  They are also used with the |fnamemodify()| function.
 These are not available when Vim has been compiled without the |+modify_fname|
@@ -875,6 +891,10 @@ These modifiers can be given, in this order:
 	:gs?pat?sub?
 		Substitute all occurrences of "pat" with "sub".  Otherwise
 		this works like ":s".
+	:S	Escape special characters for use with a shell command (see
+		|shellescape()|). Must be the last one. Examples: >
+		    :!dir <cfile>:S
+		    :call system('chmod +w -- ' . expand('%:S'))

 Examples, when the file name is "src/version.c", current dir
 "/home/mool/vim": >
@@ -924,9 +944,8 @@ name).  This is included for backwards compatibility with version 3.0, the

 Note: Where a file name is expected wildcards expansion is done.  On Unix the
 shell is used for this, unless it can be done internally (for speed).
-Backticks also work, like in >
+Unless in |restricted-mode|, backticks work also, like in >
 	:n `echo *.c`
-(backtick expansion is not possible in |restricted-mode|)
 But expansion is only done if there are any wildcards before expanding the
 '%', '#', etc..  This avoids expanding wildcards inside a file name.  If you
 want to expand the result of <cfile>, add a wildcard character to it.
@@ -937,6 +956,7 @@ Examples: (alternate file name is "?readme?")
 	:e #.*		:e {files matching "?readme?.*"}
 	:cd <cfile>	:cd {file name under cursor}
 	:cd <cfile>*	:cd {file name under cursor plus "*" and then expanded}
+Also see |`=|.

 When the expanded argument contains a "!" and it is used for a shell command
 (":!cmd", ":r !cmd" or ":w !cmd"), the "!" is escaped with a backslash to
@@ -963,6 +983,8 @@ for the file "$home" in the root directory.  A few examples:
 	/\$home		file "$home" in root directory
 	\\$home		file "\\", followed by expanded $home

+Also see |`=|.
+
 ==============================================================================
 7. Command-line window				*cmdline-window* *cmdwin*
 							*command-line-window*
@@ -1075,6 +1097,9 @@ another window, or drag statuslines of other windows.  You can drag the
 statusline of the command-line window itself and the statusline above it.
 Thus you can resize the command-line window, but not others.

+The |getcmdwintype()| function returns the type of the command-line being
+edited as described in |cmdwin-char|.
+

 AUTOCOMMANDS

--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.3.  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.3.  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.3.  Last change: 2013 Apr 27
+*develop.txt*   For Vim version 7.4.  Last change: 2014 Mar 27


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -19,7 +19,6 @@ code.

 Vim is open source software.  Everybody is encouraged to contribute to help
 improving Vim.  For sending patches a context diff "diff -c" is preferred.
-Also see http://www.vim.org/tips/tip.php?tip_id=618.
 Also see http://vim.wikia.com/wiki/How_to_make_and_submit_a_patch.

 ==============================================================================
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.3.  Last change: 2012 Sep 05
+*diff.txt*      For Vim version 7.4.  Last change: 2015 Nov 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -95,7 +95,7 @@ While already in Vim you can start diff mode in three ways.
 :difft[his]	Make the current window part of the diff windows.  This sets
 		the options like for "vimdiff".

-:diffp[atch] {patchfile}				 *E816* *:diffp* *:diffpatch*
+:diffp[atch] {patchfile}			 *E816* *:diffp* *:diffpatch*
 		Use the current buffer, patch it with the diff found in
 		{patchfile} and open a buffer on the result.  The options are
 		set as for "vimdiff".
@@ -123,14 +123,19 @@ Since the option values are remembered with the buffer, you can edit another
 file for a moment and come back to the same file and be in diff mode again.

 							*:diffo* *:diffoff*
-:diffo[ff]	Switch off diff mode for the current window.
+:diffo[ff]	Switch off diff mode for the current window.  Resets related
+		options also when 'diff' was not set.

 :diffo[ff]!	Switch off diff mode for the current window and in all windows
-		in the current tab page where 'diff' is set.
+		in the current tab page where 'diff' is set.  Resetting
+		related options only happens in a window that has 'diff' set,
+		if the current window does not have 'diff' set then no options
+		in it are changed.

-The ":diffoff" command resets the relevant options to their default value.
-This may be different from what the values were before diff mode was started,
-the old values are not remembered.
+The `:diffoff` command resets the relevant options to the values they had when
+using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
+When using `:diffoff` twice the last saved values are restored.
+Otherwise they are set to their default value:

 	'diff'		off
 	'scrollbind'	off
@@ -177,8 +182,8 @@ hidden buffers.  You can use ":hide" to close a window without unloading the
 buffer.  If you don't want a buffer to remain used for the diff do ":set
 nodiff" before hiding it.

-							*:diffu* *:diffupdate*
-:diffu[pdate][!]		Update the diff highlighting and folds.
+							*:dif* *:diffupdate*
+:dif[fupdate][!]		Update the diff highlighting and folds.

 Vim attempts to keep the differences updated when you make changes to the
 text.  This mostly takes care of inserted and deleted lines.  Changes within a
@@ -262,13 +267,17 @@ that the buffers will be equal within the specified range.
 		See below for [range].

 							*do*
-do		Same as ":diffget" without argument or range.  The "o" stands
-		for "obtain" ("dg" can't be used, it could be the start of
-		"dgg"!). Note: this doesn't work in Visual mode.
+[count]do	Same as ":diffget" without range.  The "o" stands for "obtain"
+		("dg" can't be used, it could be the start of "dgg"!). Note:
+		this doesn't work in Visual mode.
+		If you give a [count], it is used as the [bufspec] argument
+		for ":diffget".

 							*dp*
-dp		Same as ":diffput" without argument or range.
-		Note: this doesn't work in Visual mode.
+[count]dp	Same as ":diffput" without range.  Note: this doesn't work in
+		Visual mode.
+		If you give a [count], it is used as the [bufspec] argument
+		for ":diffput".


 When no [range] is given, the diff at the cursor position or just above it is
@@ -306,6 +315,19 @@ name or a part of a buffer name.  Examples:

 Also see |'diffopt'| and the "diff" item of |'fillchars'|.

+					    *diff-slow* *diff_translations*
+For very long lines, the diff syntax highlighting might be slow, especially
+since it tries to match all different kind of localisations. To disable
+localisations and speed up the syntax highlighting, set the global variable
+g:diff_translations to zero: >
+
+    let g:diff_translations = 0
+<
+After setting this variable, Reload the syntax script: >
+
+    set syntax=diff
+<
+

 FINDING THE DIFFERENCES					*diff-diffexpr*

--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.3.  Last change: 2011 Jan 15
+*digraph.txt*   For Vim version 7.4.  Last change: 2014 Jun 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -147,7 +147,7 @@ a standard meaning:
 	Two			2	Hook
 	Nine			9	Horn

-	Equals			=	Cyrillic
+	Equals			=	Cyrillic (= used as second char) 
 	Asterisk		*	Greek
 	Percent sign		%	Greek/Cyrillic special
 	Plus			+	smalls: Arabic, capitals: Hebrew
@@ -170,6 +170,11 @@ used for the currency sign, and latin9 (iso-8859-15), where the digraph =e is
 used for the euro sign, while both of them are the character 164, 0xa4.  For
 compatibility with zsh Eu can also be used for the euro sign.

+ROUBLE
+
+The rouble sign was added in 2014 as 0x20bd.  Vim supports the digraphs =R and
+=P for this.  Note that R= and P= are other characters.
+
 							*digraph-table*
 char  digraph	hex	dec	official name ~
 ^@	NU	0x00	  0	NULL (NUL)
@@ -966,6 +971,8 @@ char  digraph	hex	dec	official name ~
 ₧	Pt	20A7	8359	PESETA SIGN
 ₩	W=	20A9	8361	WON SIGN
 €	Eu	20AC	8364	EURO SIGN
+₽	=R	20BD	8381	ROUBLE SIGN
+₽	=P	20BD	8381	ROUBLE SIGN
 ℃	oC	2103	8451	DEGREE CELSIUS
 ℅	co	2105	8453	CARE OF
 ℉	oF	2109	8457	DEGREE FAHRENHEIT
@@ -1077,7 +1084,7 @@ char  digraph	hex	dec	official name ~
 ⊥	-T	22A5	8869	UP TACK
 ⋅	.P	22C5	8901	DOT OPERATOR
 ⋮	:3	22EE	8942	VERTICAL ELLIPSIS
-⋯       .3      22EF    8943    MIDLINE HORIZONTAL ELLIPSIS
+⋯	.3	22EF	8943	MIDLINE HORIZONTAL ELLIPSIS
 ⌂	Eh	2302	8962	HOUSE
 ⌈	<7	2308	8968	LEFT CEILING
 ⌉	>7	2309	8969	RIGHT CEILING
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.3.  Last change: 2013 Feb 07
+*editing.txt*   For Vim version 7.4.  Last change: 2015 Aug 25


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -38,6 +38,7 @@ If there already was a current file name, then that one becomes the alternate
 file name.  It can be used with "#" on the command line |:_#| and you can use
 the |CTRL-^| command to toggle between the current and the alternate file.
 However, the alternate file name is not changed when |:keepalt| is used.
+An alternate file name is remembered for each window.

 							*:keepalt* *:keepa*
 :keepalt {cmd}		Execute {cmd} while keeping the current alternate file
@@ -185,12 +186,13 @@ If you want to automatically save the changes without asking, switch on the
 that does not work for all commands.

 If you want to keep the changed buffer without saving it, switch on the
-'hidden' option.  See |hidden-buffer|.
+'hidden' option.  See |hidden-buffer|.  Some commands work like this even when
+'hidden' is not set, check the help for the command.

 ==============================================================================
 2. Editing a file					*edit-a-file*

-							*:e* *:edit*
+							*:e* *:edit* *reload*
 :e[dit] [++opt] [+cmd]	Edit the current file.  This is useful to re-edit the
 			current file, when it has been changed outside of Vim.
 			This fails when changes have been made to the current
@@ -199,7 +201,7 @@ If you want to keep the changed buffer without saving it, switch on the
 			Also see |++opt| and |+cmd|.
 			{Vi: no ++opt}

-							*:edit!*
+							*:edit!* *discard*
 :e[dit]! [++opt] [+cmd]
 			Edit the current file always.  Discard any changes to
 			the current buffer.  This is useful if you want to
@@ -302,7 +304,8 @@ CTRL-^			Edit the alternate file.  Mostly the alternate file is
 			Mnemonic: "goto file".
 			Uses the 'isfname' option to find out which characters
 			are supposed to be in a file name.  Trailing
-			punctuation characters ".,:;!" are ignored.
+			punctuation characters ".,:;!" are ignored. Escaped
+			spaces "\ " are reduced to a single space.
 			Uses the 'path' option as a list of directory names to
 			look for the file.  See the 'path' option for details
 			about relative directories and wildcards.
@@ -409,25 +412,38 @@ Finds files:
 	/usr/include/sys/types.h
 	/usr/inc_old/types.h
 					*backtick-expansion* *`-expansion*
-On Unix and a few other systems you can also use backticks in the file name,
-for example: >
-	:e `find . -name ver\\*.c -print`
-The backslashes before the star are required to prevent "ver*.c" to be
-expanded by the shell before executing the find program.
+On Unix and a few other systems you can also use backticks for the file name
+argument, for example: >
+	:next `find . -name ver\\*.c -print`
+	:view `ls -t *.patch  \| head -n1`
+The backslashes before the star are required to prevent the shell from
+expanding "ver*.c" prior to execution of the find program.  The backslash
+before the shell pipe symbol "|" prevents Vim from parsing it as command
+termination.
 This also works for most other systems, with the restriction that the
 backticks must be around the whole item.  It is not possible to have text
 directly before the first or just after the last backtick.

 							*`=*
-You can have the backticks expanded as a Vim expression, instead of an
-external command, by using the syntax `={expr}` e.g.: >
+You can have the backticks expanded as a Vim expression, instead of as an
+external command, by putting an equal sign right after the first backtick,
+e.g.: >
 	:e `=tempname()`
 The expression can contain just about anything, thus this can also be used to
 avoid the special meaning of '"', '|', '%' and '#'.  However, 'wildignore'
 does apply like to other wildcards.
+
+Environment variables in the expression are expanded when evaluating the
+expression, thus this works: >
+	:e `=$HOME . '/.vimrc'`
+This does not work, $HOME is inside a string and used literally: >
+	:e `='$HOME' . '/.vimrc'`
+
 If the expression returns a string then names are to be separated with line
 breaks.  When the result is a |List| then each item is used as a name.  Line
 breaks also separate names.
+Note that such expressions are only supported in places where a filename is
+expected as an argument to an Ex-command.

 							*++opt* *[++opt]*
 The [++opt] argument can be used to force the value of 'fileformat',
@@ -607,7 +623,10 @@ list of the current window.
 			{not in Vi}

 :[count]arga[dd] {name} ..			*:arga* *:argadd* *E479*
-			Add the {name}s to the argument list.
+:[count]arga[dd]
+			Add the {name}s to the argument list.  When {name} is
+			omitted add the current buffer name to the argument
+			list.
 			If [count] is omitted, the {name}s are added just
 			after the current entry in the argument list.
 			Otherwise they are added after the [count]'th file.
@@ -617,7 +636,8 @@ list of the current window.
 				:argadd x	a b x c
 				:0argadd x	x a b c
 				:1argadd x	a x b c
-				:99argadd x	a b c x
+				:$argadd x	a b c x
+				:+2argadd y	a b c x y
 			There is no check for duplicates, it is possible to
 			add a file to the argument list twice.
 			The currently edited file is not changed.
@@ -639,11 +659,19 @@ list of the current window.
 <			{not in Vi} {not available when compiled without the
 			|+listcmds| feature}

-:{range}argd[elete]	Delete the {range} files from the argument list.
+:[range]argd[elete]	Delete the {range} files from the argument list.
+			Example: >
+				:10,$argdel
+<			Deletes arguments 10 and further, keeping 1-9. >
+				:$argd
+<			Deletes just the last one. >
+				:argd
+				:.argd
+<			Deletes the current argument. >
+				:%argd
+<			Removes all the files from the arglist.
 			When the last number in the range is too high, up to
-			the last argument is deleted.  Example: >
-				:10,1000argdel
-<			Deletes arguments 10 and further, keeping 1-9.
+			the last argument is deleted.
 			{not in Vi} {not available when compiled without the
 			|+listcmds| feature}

@@ -818,8 +846,9 @@ current window.  The two windows then share this list, until one of them uses
 USING THE ARGUMENT LIST

 						*:argdo*
-:argdo[!] {cmd}		Execute {cmd} for each file in the argument list.
-			It works like doing this: >
+:[range]argdo[!] {cmd}	Execute {cmd} for each file in the argument list or
+			if [range] is specified only for arguments in that
+			range.  It works like doing this: >
 				:rewind
 				:{cmd}
 				:next
@@ -839,7 +868,8 @@ USING THE ARGUMENT LIST
 			each file.
 			{not in Vi} {not available when compiled without the
 			|+listcmds| feature}
-			Also see |:windo|, |:tabdo| and |:bufdo|.
+			Also see |:windo|, |:tabdo|, |:bufdo|, |:cdo|, |:ldo|,
+			|:cfdo| and |:lfdo|

 Example: >
 	:args *.c
@@ -1075,9 +1105,12 @@ The names can be in upper- or lowercase.
 			the last file in the argument list has not been
 			edited.  See |:confirm| and 'confirm'.  {not in Vi}

-:q[uit]!		Quit without writing, also when visible buffers have
-			changes.  Does not exit when there are changed hidden
-			buffers.  Use ":qall!" to exit always.
+:q[uit]!		Quit without writing, also when currently visible
+			buffers have changes.  Does not exit when this is the
+			last window and there is a changed hidden buffer.
+			In this case, the first changed hidden buffer becomes
+			the current buffer.
+			Use ":qall!" to exit always.

 :cq[uit]		Quit always, without writing, and return an error
 			code.  See |:cq|.  Used for Manx's QuickFix mode (see
@@ -1344,7 +1377,7 @@ There are a few things to remember when editing binary files:
 - <Nul> characters are shown on the screen as ^@.  You can enter them with
  "CTRL-V CTRL-@" or "CTRL-V 000" {Vi cannot handle <Nul> characters in the
  file}
- To insert a <NL> character in the file split up a line.  When writing the
+- To insert a <NL> character in the file split a line.  When writing the
  buffer to a file a <NL> will be written for the <EOL>.
 - Vim normally appends an <EOL> at the end of the file if there is none.
  Setting the 'binary' option prevents this.  If you want to add the final
@@ -1360,11 +1393,22 @@ cannot be read without the right key.
 {only available when compiled with the |+cryptv| feature}  *E833*

 The text in the swap file and the undo file is also encrypted.  *E843*
+However, this is done block-by-block and may reduce the time needed to crack a
+password.  You can disable the swap file, but then a crash will cause you to
+lose your work.  The undo file can be disabled without much disadvantage. >
+	:set noundofile
+	:noswapfile edit secrets

 Note: The text in memory is not encrypted.  A system administrator may be able
 to see your text while you are editing it.  When filtering text with
-":!filter" or using ":w !command" the text is not encrypted, this may reveal
-it to others.  The 'viminfo' file is not encrypted.
+":!filter" or using ":w !command" the text is also not encrypted, this may
+reveal it to others.  The 'viminfo' file is not encrypted.
+
+You could do this to edit very secret text: >
+	:set noundofile viminfo=
+	:noswapfile edit secrets.txt
+Keep in mind that without a swap file you risk losing your work in the event
+of a crash or a power failure.

 WARNING: If you make a typo when entering the key and then write the file and
 exit, the text will be lost!
@@ -1391,18 +1435,23 @@ To disable the encryption, reset the 'key' option to an empty value: >
 	:set key=

 You can use the 'cryptmethod' option to select the type of encryption, use one
-of these two: >
-	:setlocal cm=zip       " weak method, backwards compatible
-	:setlocal cm=blowfish  " strong method
+of these: >
+	:setlocal cm=zip        " weak method, backwards compatible
+	:setlocal cm=blowfish   " method with flaws
+	:setlocal cm=blowfish2  " medium strong method
+
 Do this before writing the file.  When reading an encrypted file it will be
 set automatically to the method used when that file was written.  You can
 change 'cryptmethod' before writing that file to change the method.
-To set the default method, used for new files, use one of these in your
-|vimrc| file: >
-	set cm=zip
-	set cm=blowfish
+
+To set the default method, used for new files, use this in your |vimrc| 
+file: >
+	set cm=blowfish2
+Using "blowfish2" is highly recommended.  Only use another method if you
+must use an older Vim version that does not support it.
+
 The message given for reading and writing a file will show "[crypted]" when
-using zip, "[blowfish]" when using blowfish.
+using zip, "[blowfish]" when using blowfish, etc.

 When writing an undo file, the same key and method will be used for the text
 in the undo file. |persistent-undo|.
@@ -1437,7 +1486,7 @@ lines to "/etc/magic", "/usr/share/misc/magic" or wherever your system has the
     0	string	VimCrypt~	Vim encrypted file
     >9	string	01	- "zip" cryptmethod
     >9	string	02	- "blowfish" cryptmethod
-
+     >9	string	03	- "blowfish2" cryptmethod

 Notes:
 - Encryption is not possible when doing conversion with 'charconvert'.
@@ -1461,20 +1510,25 @@ Notes:
 - Pkzip uses the same encryption as 'cryptmethod' "zip", and US Govt has no
  objection to its export.  Pkzip's public file APPNOTE.TXT describes this
  algorithm in detail.
+- The implementation of 'cryptmethod' "blowfish" has a flaw.  It is possible
+  to crack the first 64 bytes of a file and in some circumstances more of the
+  file. Use of it is not recommended, but it's still the strongest method
+  supported by Vim 7.3 and 7.4.  The "zip" method is even weaker.
 - Vim originates from the Netherlands.  That is where the sources come from.
  Thus the encryption code is not exported from the USA.

 ==============================================================================
 10. Timestamps					*timestamp* *timestamps*

-Vim remembers the modification timestamp of a file when you begin editing it.
-This is used to avoid that you have two different versions of the same file
-(without you knowing this).
+Vim remembers the modification timestamp, mode and size of a file when you
+begin editing it.  This is used to avoid that you have two different versions
+of the same file (without you knowing this).

-After a shell command is run (|:!cmd| |suspend| |:read!| |K|) timestamps are
-compared for all buffers in a window.   Vim will run any associated
-|FileChangedShell| autocommands or display a warning for any files that have
-changed.  In the GUI this happens when Vim regains input focus.
+After a shell command is run (|:!cmd| |suspend| |:read!| |K|) timestamps,
+file modes and file sizes are compared for all buffers in a window.   Vim will
+run any associated |FileChangedShell| autocommands or display a warning for
+any files that have changed.  In the GUI this happens when Vim regains input
+focus.

 							*E321* *E462*
 If you want to automatically reload a file when it has been changed outside of
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
--- a/runtime/doc/evim-fr.1
+++ b/runtime/doc/evim-fr.1
@@ -1,4 +1,4 @@
-.TH EVIM 1 "16 f<>vrier 2002 February 16"
+.TH EVIM 1 "16 f<>vrier 2002"
 .SH NAME
 evim \- <20> Easy Vim <20>, <20>dite un fichier avec Vim sans utiliser les modes
 .SH SYNOPSIS
@@ -54,4 +54,4 @@ Voir le menu Aide/Remerciements ou ":help credits" dans
 .SH TRADUCTION
 Cette page de manuel a <20>t<EFBFBD> traduite David Blanchet.
 <david.blanchet@free.fr> 2005-03-26.
-Mise <20> jour 2012-05-06, Dominique Pell<6C> <dominique.pelle@gmail.com>
+Mise <20> jour 2013-05-10, Dominique Pell<6C> <dominique.pelle@gmail.com>
--- a/runtime/doc/evim-fr.UTF-8.1
+++ b/runtime/doc/evim-fr.UTF-8.1
@@ -1,4 +1,4 @@
-.TH EVIM 1 "16 février 2002 February 16"
+.TH EVIM 1 "16 février 2002"
 .SH NAME
 evim \- « Easy Vim », édite un fichier avec Vim sans utiliser les modes
 .SH SYNOPSIS
@@ -54,4 +54,4 @@ Voir le menu Aide/Remerciements ou ":help credits" dans
 .SH TRADUCTION
 Cette page de manuel a été traduite David Blanchet.
 <david.blanchet@free.fr> 2005-03-26.
-Mise à jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com>
+Mise à jour 2013-05-10, Dominique Pellé <dominique.pelle@gmail.com>
--- a/runtime/doc/evim-ja.UTF-8.1
+++ b/runtime/doc/evim-ja.UTF-8.1
@@ -0,0 +1,51 @@
+.TH EVIM 1 "2002 February 16"
+.SH 名前
+evim \- easy Vim, モードレスエディタ Vim
+.SH 書式
+.br
+.B evim
+[options] [file ..]
+.br
+.B eview
+.SH 説明
+.B eVim
+は
+.B Vim
+を起動して、モードレスエディタとして動作するためのオプションを設定します。
+Vim の動作が point-and-click エディタのような動作になります。
+MS-Windows のメモ帳のような動作です。
+.B eVim
+は常に GUI で起動し、メニューとツールバーを表示します。
+.PP
+どうしても Vim の操作に馴染めない場合に使ってください。
+編集効率は下がります。
+.PP
+.B eview
+は同様に、読み込み専用モードで起動します。evim \-R と同じです。
+.PP
+引数や Vim についての詳細は vim(1) を参照してください。
+.PP
+オプション 'insertmode' が設定され、テキストを直接、入力できるようになりま
+す。
+.br
+コピーとペーストのキー操作が MS-Windows と同じになるように、マップが設定され
+ます。
+CTRL-X が切り取り、CTRL-C がコピー、CTRL-V がペーストです。
+標準の CTRL-V の操作は CTRL-Q に割り当てられます。
+.SH オプション
+vim(1) を参照してください。
+.SH ファイル
+.TP 15
+/usr/local/lib/vim/evim.vim
+eVim の初期化スクリプト。
+.SH 別名
+evim は "gumbies のための Vim" とも呼ばれています。
+evim を使っているあなたはきっと、頭にハンカチをかぶっているのです。
+(訳注: gumbies は Monty Python に登場するおもしろ集団。ハンカチをかぶっ
+ている。)
+.SH 関連項目
+vim(1)
+.SH 著者
+.B Vim
+のほとんどの機能は Bram Moolenaar が開発し、多くの人が協力しました。
+メニューの Help/Credits を参照してください。
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.3.  Last change: 2010 Aug 07
+*farsi.txt*     For Vim version 7.4.  Last change: 2015 Aug 29


 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
@@ -59,7 +59,7 @@ o  Toggling between Farsi ISIR-3342 standard encoding and Vim Farsi via F9
   right-to-left mode, this function is also supported only in right-to-left
   mode.

-Farsi Fonts					*farsi fonts*
+Farsi Fonts					*farsi-fonts*
 -----------

 The following files are found in the subdirectories of the '$VIM/farsi/fonts'
@@ -222,7 +222,7 @@ o  Keyboard
 Note:
 	<09>  stands for Farsi PSP (break without space)

-	<09>  stands for Farsi PCN (for HAMZE attribute )
+	<09>  stands for Farsi PCN (for HAMZE attribute)

 Restrictions
 ------------
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.3.  Last change: 2011 Jun 19
+*filetype.txt*  For Vim version 7.4.  Last change: 2015 Dec 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -447,23 +447,25 @@ g:changelog_new_date_format
 				%%	insert a single '%' character
 				%d	insert the date from above
 				%u	insert the user from above
+                                %p	insert result of b:changelog_entry_prefix
 				%c	where to position cursor when done
-			The default is "%d  %u\n\n\t* %c\n\n", which produces
+			The default is "%d  %u\n\n\t* %p%c\n\n", which produces
 			something like (| is where cursor will be, unless at
 			the start of the line where it denotes the beginning
 			of the line) >
 				|2003-01-14  Full Name  <user@host>
 				|
-				|        * |
+				|        * prefix|
 <
 g:changelog_new_entry_format
 			The format used when creating a new entry.
 			The following table describes special tokens in the
 			string:
+                                %p	insert result of b:changelog_entry_prefix
 				%c	where to position cursor when done
 			The default is "\t*%c", which produces something
 			similar to >
-				|        * |
+				|        * prefix|
 <
 g:changelog_date_entry_search
 			The search pattern to use when searching for a
@@ -550,7 +552,7 @@ Local mappings:
 	to the end of the file in Normal mode.  This means "> " is inserted in
 	each line.

-MAN							*ft-man-plugin* *:Man*
+MAN					*ft-man-plugin* *:Man* *man.vim*

 Displays a manual page in a nice way.  Also see the user manual
 |find-manpage|.
@@ -575,6 +577,13 @@ Global mapping:
 Local mappings:
 CTRL-]		Jump to the manual page for the word under the cursor.
 CTRL-T		Jump back to the previous manual page.
+q		Same as ":quit"
+
+To enable folding use this: >
+  	let g:ft_man_folding_enable = 1
+If you do not like the default folding, use an autocommand to add your desired
+folding style instead.  For example: >
+        autocmd FileType man setlocal foldmethod=indent foldenable


 PDF							*ft-pdf-plugin*
@@ -603,7 +612,7 @@ Since the text for this plugin is rather long it has been put in a separate
 file: |ft_sql.txt|.


-TEX							*ft-tex-plugin*
+TEX						*ft-tex-plugin* *g:tex_flavor*

 If the first line of a *.tex file has the form >
 	%&<format>
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.3.  Last change: 2010 May 13
+*fold.txt*      For Vim version 7.4.  Last change: 2015 Nov 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -97,9 +97,9 @@ These are the conditions with which the expression is evaluated:
 			lowest.
  "="			use fold level from the previous line
  "a1", "a2", ..	add one, two, .. to the fold level of the previous
-			line
+			line, use the result for the current line
  "s1", "s2", ..	subtract one, two, .. from the fold level of the
-			previous line
+			previous line, use the result for the next line
  "<1", "<2", ..	a fold with this level ends at this line
  ">1", ">2", ..	a fold with this level starts at this line

@@ -122,6 +122,18 @@ method can be very slow!
 Try to avoid the "=", "a" and "s" return values, since Vim often has to search
 backwards for a line for which the fold level is defined.  This can be slow.

+An example of using "a1" and "s1": For a multi-line C comment, a line
+containing "/*" would return "a1" to start a fold, and a line containing "*/"
+would return "s1" to end the fold after that line: >
+  if match(thisline, '/\*') >= 0
+    return 'a1'
+  elseif match(thisline, '\*/') >= 0
+    return 's1'
+  else
+    return '='
+  endif
+However, this won't work for single line comments, strings, etc.
+
 |foldlevel()| can be useful to compute a fold level relative to a previous
 fold level.  But note that foldlevel() may return -1 if the level is not known
 yet.  And it returns the level at the start of the line, while a fold might
@@ -285,9 +297,10 @@ zF		Create a fold for [count] lines.  Works like "zf".
 							*zd* *E351*
 zd		Delete one fold at the cursor.  When the cursor is on a folded
 		line, that fold is deleted.  Nested folds are moved one level
-		up.  In Visual mode all folds (partially) in the selected area
-		are deleted.  Careful: This easily deletes more folds than you
-		expect and there is no undo.
+		up.  In Visual mode one level of all folds (partially) in the
+		selected area are deleted.
+		Careful: This easily deletes more folds than you expect and
+		there is no undo for manual folding.
 		This only works when 'foldmethod' is "manual" or "marker".
 		Also see |fold-delete-marker|.

@@ -364,7 +377,7 @@ zX		Undo manually opened and closed folds: re-apply 'foldlevel'.
 		Also forces recomputing folds, like |zx|.

 							*zm*
-zm		Fold more: Subtract one from 'foldlevel'.  If 'foldlevel' was
+zm		Fold more: Subtract |v:count1| from 'foldlevel'.  If 'foldlevel' was
 		already zero nothing happens.
 		'foldenable' will be set.

@@ -373,7 +386,7 @@ zM		Close all folds: set 'foldlevel' to 0.
 		'foldenable' will be set.

 							*zr*
-zr		Reduce folding: Add one to 'foldlevel'.
+zr		Reduce folding: Add |v:count1| to 'foldlevel'.

 							*zR*
 zR		Open all folds.  This sets 'foldlevel' to highest fold level.
--- a/runtime/doc/ft_ada.txt
+++ b/runtime/doc/ft_ada.txt
@@ -1,4 +1,4 @@
-*ft_ada.txt*	For Vim version 7.3.  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.3.  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.3.  Last change: 2011 Jul 22
+*gui.txt*       For Vim version 7.4.  Last change: 2014 Mar 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -93,10 +93,16 @@ and initialize other things that you may want to set up differently from the
 terminal version.

 Recommended place for your personal GUI initializations:
-	Unix		    $HOME/.gvimrc
-	OS/2		    $HOME/.gvimrc or $VIM/.gvimrc
-	MS-DOS and Win32    $HOME/_gvimrc or $VIM/_gvimrc
-	Amiga		    s:.gvimrc or $VIM/.gvimrc
+	Unix		    $HOME/.gvimrc or $HOME/.vim/gvimrc
+	OS/2		    $HOME/.gvimrc, $HOME/vimfiles/gvimrc
+			    or $VIM/.gvimrc
+	MS-DOS and Win32    $HOME/_gvimrc, $HOME/vimfiles/gvimrc
+			    or $VIM/_gvimrc
+	Amiga		    s:.gvimrc, home:.gvimrc, home:vimfiles:gvimrc
+			    or $VIM/.gvimrc
+
+The personal initialization files are searched in the order specified above
+and only the first one that is found is read.

 There are a number of options which only have meaning in the GUI version of
 Vim.  These are 'guicursor', 'guifont', 'guipty' and 'guioptions'.  They are
@@ -127,6 +133,7 @@ task bar with the 'guiheadroom' option.
 :winp[os]
 		Display current position of the top left corner of the GUI vim
 		window in pixels.  Does not work in all versions.
+		Also see |getwinposx()| and |getwinposy()|.

 :winp[os] {X} {Y}							*E466*
 		Put the GUI vim window at the given {X} and {Y} coordinates.
@@ -145,8 +152,11 @@ task bar with the 'guiheadroom' option.
 		option.

 If you are running the X Window System, you can get information about the
-window Vim is running in with this command: >
+window Vim is running in with these commands: >
 	:!xwininfo -id $WINDOWID
+	:!xprop -id $WINDOWID
+	:execute '!xwininfo -id ' . v:windowid
+	:execute '!xprop -id ' . v:windowid
 <
 							*gui-IME* *iBus*
 Input methods for international characters in X that rely on the XIM
--- a/runtime/doc/gui_w16.txt
+++ b/runtime/doc/gui_w16.txt
@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.3.  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.3.  Last change: 2012 Aug 04
+*gui_w32.txt*   For Vim version 7.4.  Last change: 2014 Dec 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -452,9 +452,10 @@ detailed elsewhere: see |'mouse'|, |win32-hidden-menus|.
 You can drag and drop one or more files into the Vim window, where they will
 be opened as normal.  See |drag-n-drop|.

-							*:simalt* *:si*
+							*:simalt* *:sim*
 :sim[alt] {key}		simulate pressing {key} while holding Alt pressed.
 			{not in Vi} {only for Win32 versions}
+			Note: ":si" means ":s" with the "i" flag.

 Normally, Vim takes control of all Alt-<Key> combinations, to increase the
 number of possible mappings.  This clashes with the standard use of Alt as the
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.3.  Last change: 2011 Sep 14
+*gui_x11.txt*   For Vim version 7.4.  Last change: 2014 Mar 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -442,7 +442,7 @@ command line argument).
 							*gui-x11-kde*
 There is no KDE version of Vim.  There has been some work on a port using the
 Qt toolkit, but it never worked properly and it has been abandoned.  Work
-continues on Yzis: www.yzis.org.
+continues on Yzis: https://github.com/chrizel/Yzis.

 ==============================================================================
 8. Compiling						*gui-x11-compiling*
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -1,11 +1,8 @@
-*hangulin.txt*  For Vim version 7.3.  Last change: 2009 Jun 24
+*hangulin.txt*  For Vim version 7.4.  Last change: 2015 Nov 24


 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam

-NOTE: The |+hangul_input| feature is scheduled to be removed.  If you want to
-keep it, please send a message to the Vim user maillist.
-

 Introduction					*hangul*
 ------------
@@ -17,7 +14,8 @@ Compile
 -------
 Next is a basic option.  You can add any other configure option. >

-   ./configure --with-x --enable-multibyte --enable-fontset --enable-hangulinput
+   ./configure --with-x --enable-multibyte --enable-hangulinput \
+            --disable-xim

 And you should check feature.h.  If |+hangul_input| feature is enabled
 by configure, you can select more options such as keyboard type, 2 bulsik
@@ -26,18 +24,21 @@ or 3 bulsik.  You can find keywords like next in there. >
 	#define HANGUL_DEFAULT_KEYBOARD 2
 	#define ESC_CHG_TO_ENG_MODE
 	/* #define X_LOCALE */
-	/* #define SLOW_XSERVER */

 Environment variables
 ---------------------
-You should set LANG variable to Korean locale such as ko or ko_KR.euc.
+You should set LANG variable to Korean locale such as ko, ko_KR.eucKR
+or ko_KR.UTF-8.
 If you set LC_ALL variable, it should be set to Korean locale also.

 VIM resource
 ------------
-You should add nexts to your global vimrc ($HOME/.vimrc). >
+You may want to set 'encoding' and 'fileencodings'.
+Next are examples: >

-	:set fileencoding=korea
+	:set encoding=euc-kr
+	:set encoding=utf-8
+	:set fileencodings=ucs-bom,utf-8,cp949,euc-kr,latin1

 Keyboard
 --------
@@ -52,8 +53,16 @@ If both are set, VIM_KEYBOARD has higher priority.

 Hangul Fonts
 ------------
-You can set text font using $HOME/.Xdefaults or in your gvimrc file.
-But to use Hangul, you should set 'guifontset' in your vimrc.
+If you use GTK version of GVIM, you should set 'guifont' and 'guifontwide'.
+For example: >
+    set guifont=Courier\ 12
+    set guifontwide=NanumGothicCoding\ 12
+
+If you use Motif or Athena version of GVIM, you should set 'guifontset' in
+your vimrc.  You can set fontset in the .Xdefaults file.
+
+$HOME/.gvimrc: >
+    set guifontset=english_font,hangul_font

 $HOME/.Xdefaults: >
    Vim.font: english_font
@@ -66,40 +75,38 @@ $HOME/.Xdefaults: >
    *international: True
    Vim*fontList: english_font;hangul_font:

-$HOME/.gvimrc: >
-    set guifontset=english_font,hangul_font
-
 attention! the , (comma) or ; (semicolon)

 And there should be no ':set guifont'.  If it exists, then Gvim ignores
 ':set guifontset'.  It means VIM runs without fontset supporting.
 So, you can see only English.  Hangul does not be correctly displayed.

-After 'fontset' feature is enabled, VIM does not allow using 'font'.
+After 'fontset' feature is enabled, VIM does not allow using english
+font only in 'font' setting for syntax.
 For example, if you use >
   :set guifontset=eng_font,your_font
 in your .gvimrc, then you should do for syntax >
   :hi Comment guifg=Cyan font=another_eng_font,another_your_font
 If you just do >
   :hi Comment font=another_eng_font
-then you can see a GOOD error message.  Be careful!
+then you can see a error message.  Be careful!

 hangul_font width should be twice than english_font width.

 Unsupported Feature
 -------------------
-Johab font not yet supported.  And I don't have any plan.
-If you really want to use johab font, you can use the
-hanguldraw.c in gau package.
+We don't support Johab font.
+We don't support Hanja input.
+And We don't have any plan to support them.

-Hanja input not yet supported.  And I don't have any plan.
-If you really want to input hanja, just use VIM with hanterm.
+If you really need such features, you can use console version of VIM with a
+capable terminal emulator.

 Bug or Comment
 --------------
 Send comments, patches and suggestions to:

-				    Chi-Deok Hwang <hwang@mizi.co.kr>
 				    SungHyun Nam <goweol@gmail.com>
+				    Chi-Deok Hwang <...>

 vim:tw=78:ts=8:ft=help:norl:
--- a/Show More
+++ b/Show More