updated for version 7.4.017

Problem: ":help !!" does not find the "!!" tag in the help file. (Ben Fritz) Solution: When reading the start of the tags file do parse lines that are not header lines.
Added tag v7-4-016 for changeset 8d5cd0ec3e71
2026-06-02 11:19:22 +02:00 · 2013-09-05 12:06:33 +02:00 · 2013-08-30 17:29:16 +02:00 · 2013-08-30 17:29:16 +02:00 · 2013-08-30 17:11:33 +02:00 · 2013-08-30 17:11:33 +02:00
1028 changed files with 31854 additions and 114375 deletions
@@ -1,121 +0,0 @@
-# Unixen: object and executable files.
-*.o
-src/vim
-src/xxd/xxd
-src/auto/if_perl.c
-src/tags
-
-# We do need src/auto/configure.
-src/auto/config.aap
-src/auto/config.cache
-src/auto/config.h
-src/auto/config.log
-src/auto/config.mk
-src/auto/config.status
-src/auto/configure.aap
-src/auto/osdef.h
-src/auto/link.log
-src/auto/link.sed
-src/auto/pathdef.c
-
-# Windows
-*.exe
-*.idb
-*.manifest
-*.exp
-*.obj
-*.pdb
-*.ilk
-*.sln
-*.suo
-*.res
-*.RES
-src/if_perl.c
-src/pathdef.c
-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/testdir/test*.out
-src/testdir/test*.failed
-src/testdir/test.log
-src/testdir/dostmp/*
-src/memfile_test
-
-# From MacVim
-.*.swp
-.DS_Store
-src/MacVim/MacVim.xcodeproj/*.mode1
-src/MacVim/MacVim.xcodeproj/*.mode1v3
-src/MacVim/MacVim.xcodeproj/*.pbxuser
-src/MacVim/MacVim.xcodeproj/project.xcworkspace
-src/MacVim/MacVim.xcodeproj/xcuserdata
-src/MacVim/icons/*.pyc
-src/MacVim/icons/*.ttf
-src/MacVim/icons/*.reg
-src/MacVim/icons/*.zip
-src/MacVim/icons/*.txt
-src/MacVim/icons/*.so
-src/MacVim/icons/*.egg-info
-src/MacVim/icons/build
-src/MacVim/icons/makeicns/*.o
-src/MacVim/icons/makeicns/makeicns
-src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.mode1
-src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.mode1v3
-src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/*.pbxuser
-src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/xcuserdata
-src/MacVim/PSMTabBarControl/build
-src/MacVim/PSMTabBarControl/build
-src/MacVim/build
-src/TAGS
-src/Vim
-src/auto/config.cache
-src/auto/config.h
-src/auto/config.log
-src/auto/config.mk
-src/auto/config.status
-src/auto/if_perl.c
-src/auto/link.log
-src/auto/link.sed
-src/auto/osdef.h
-src/auto/pathdef.c
-src/config.log
-src/config.status
-src/objects
-src/po/*.mo
-src/tags
-src/xxd/xxd
-src/xxd/xxd.dSYM
-src/a.out.dSYM
@@ -0,0 +1,61 @@
+syntax: glob
+
+# Unixen: object and executable files.
+*.o
+src/vim
+src/xxd/xxd
+src/auto/if_perl.c
+src/tags
+
+# We do need src/auto/configure.
+src/auto/config.aap
+src/auto/config.cache
+src/auto/config.h
+src/auto/config.log
+src/auto/config.mk
+src/auto/config.status
+src/auto/configure.aap
+src/auto/osdef.h
+src/auto/link.log
+src/auto/link.sed
+src/auto/pathdef.c
+
+# Windows
+*.exe
+*.idb
+*.manifest
+*.exp
+*.obj
+*.pdb
+*.ilk
+*.sln
+*.suo
+*.res
+*.RES
+src/if_perl.c
+src/pathdef.c
+src/Obj*/pathdef.c
+gvimext.dll
+gvimext.lib
+
+# Mac OSX
+src/xxd/xxd.dSYM
+
+# All platforms
+*.rej
+*.orig
+*.mo
+*.swp
+*~
+*.pyc
+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/testdir/test*.out
+src/testdir/test.log
@@ -1,51 +0,0 @@
-language: c
-
-os:
-  - osx
-
-osx_image: xcode7.1
-
-compiler:
-  - clang
-
-env:
-  - MACOSX_DEPLOYMENT_TARGET=10.8
-    VERSIONER_PERL_VERSION=5.16
-    VERSIONER_PYTHON_VERSION=2.7
-    vi_cv_path_python3=/usr/local/bin/python3
-    vi_cv_path_plain_lua=/usr/local/bin/lua
-    vi_cv_dll_name_perl=/System/Library/Perl/5.16/darwin-thread-multi-2level/CORE/libperl.dylib
-    vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.5/Python
-    "CONFOPT='--with-features=huge --enable-multibyte --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"
-
-sudo: false
-
-before_install:
-  - brew update || brew update
-  - brew install python3
-  - brew install lua
-
-script:
-  - NPROC=$(getconf _NPROCESSORS_ONLN)
-  - ./configure $CONFOPT --enable-fail-if-missing
-  - grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"$vi_cv_dll_name_perl\\\\\"" src/auto/config.mk
-  - grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"$vi_cv_dll_name_python3\\\\\"" src/auto/config.mk
-  - make -j$NPROC
-  - cat src/auto/config.mk
-  - ./src/vim --version
-  - make test
-
-before_deploy:
-  - make -C src macvim-dmg
-deploy:
-  provider: releases
-  api_key:
-    secure: HYHKVbuSG2Trc5zEN+aQO0TO/020qtTokoaaatd9GhQ/ImOI2uhOuVsk47mcViCINyE9+wwVEr23Tk7GqzsJBS66FoZJeOsgYoO/LFlQjCYyya+48Ajez6I2VAIGKn0JD6jpW+ZYIX7MAWLCQKv/vW03MrBMDLZvjB89pHe72MLQFlVcEzxsWnr7smTzLcuKShkV+AVZopE/HRdY1k/zjWf/TzcJgqXwThuJOPYY+CcGUv1CMJjWB8pBuH31pbQ2AVOXV7VG5oxy2HSbCeDRShKT3GooecWj7xjh9SApNqEIzC44RlufgyC73M0DeILUasmbF0g2Q+AsDaj3+9w3LbLbmfpV5kEM9E/PbzWEn+0EgRKV+HCscZnPMlzkiVWKnjzfwKGMOmTwD0aN4Bt6Y9z+UvQKfsQN+6wHmh7xcSpaeR1J6PBeaCd+QyhD7t9ZxP2qmZWCBMFpnkqO4+LoclJNV+IxYstNFjaKIvxEe/S9GM2w+i2cSDDrxSNz+kUGWzshyu6HXxRtrNo+qM6sCO8TiOMMALPAkLCJT2P/TPMRkdy2wjCDwprc1ePDqikIHIGGwQ8Csd5IqFUcJs405xw4HfVkOuhWL/SpLuI6OHOVQqAkqMEMaEhlfh1swFNkT4ffDJGzvklB8v2980B003eWbcHr6lMGtpqQecqgS9A=
-  file: src/MacVim/build/Release/MacVim-7.4.dmg
-  skip_cleanup: true
-  on:
-    all_branches: true
-    tags: true
-    repo: macvim-dev/macvim
-
-# vim:set sts=2 sw=2 tw=0 et:
@@ -1,54 +0,0 @@
-# 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.
@@ -3,9 +3,6 @@

 # source files for all source archives
 SRC_ALL =	\
-		.hgignore \
-		.travis.yml \
-		appveyor.yml \
 		src/README.txt \
 		src/arabic.c \
 		src/arabic.h \
@@ -13,8 +10,6 @@ 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 \
@@ -84,17 +79,11 @@ SRC_ALL =	\
 		src/xxd/xxd.c \
 		src/main.aap \
 		src/testdir/main.aap \
-		src/testdir/README.txt \
 		src/testdir/*.in \
-		src/testdir/sautest/autoload/*.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 \
@@ -104,15 +93,10 @@ SRC_ALL =	\
 		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 \
@@ -282,7 +266,6 @@ 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 \
@@ -300,8 +283,6 @@ 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 \
@@ -483,8 +464,6 @@ SRC_EXTRA =	\
 # runtime files for all distributions
 RT_ALL =	\
 		README.txt \
-		README.md \
-		CONTRIBUTING.md \
 		runtime/bugreport.vim \
 		runtime/doc/*.awk \
 		runtime/doc/*.pl \
@@ -584,8 +563,6 @@ 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 =	\
@@ -1,124 +0,0 @@
-`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>
@@ -1,7 +1,7 @@
 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,10 +21,6 @@ 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
@@ -98,9 +94,8 @@ 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 have problems, have a look at the Vim FAQ:
+	http://vimdoc.sf.net/vimfaq.html

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

 	Bram Moolenaar		E-mail:	Bram@vim.org
+	Finsterruetihof 1
+	8134 Adliswil
+	Switzerland
@@ -19,10 +19,8 @@ src/os_beos.*		Files for the BeOS port.
 src/os_msdos.*
 src/os_dos.*		Files for the MS-DOS port.

-src/gui_mac.*           Carbon GUI (not used)
-src/os_mac*		Shared files for the different Mac ports.
-
-src/MacVim/*		Files for the MacVim port.
+src/gui_mac.*
+src/os_mac.*		Files for the Mac port.

 src/os_mint.8		Files for the Atari Mint port.

@@ -1,38 +1,8 @@
 README_mac.txt for version 7.4 of Vim: Vi IMproved.

-This file explains the installation of MacVim.
+This file explains the installation of Vim on Macintosh systems.
 See "README.txt" for general information about Vim.
-See "src/MacVim/README" for an overview of the MacVim specific source code.
-
-MacVim uses the usual configure/make steps to build the binary but instead of
-"make install" you just drag the app bundle into the directory you wish to
-install in (usually `/Applications').


-How to build and install
-========================
+Sorry, this text still needs to be written!

-Run `./configure` in the `src/` directory with the flags you want (call
-`./configure --help` to see a list of flags) e.g.:
-
-    $ cd src
-    $ ./configure --with-features=huge \
-                  --enable-rubyinterp \
-                  --enable-pythoninterp \
-                  --enable-perlinterp \
-                  --enable-cscope
-
-Now build the project using `make`:
-
-    $ make
-
-The resulting app bundle will reside under `MacVim/build/Release`.  To try it
-out quickly, type:
-
-    $ open MacVim/build/Release/MacVim.app
-
-To install MacVim, type
-
-    $ open MacVim/build/Release
-
-and drag the MacVim icon into your `Applications` folder.
@@ -1,15 +0,0 @@
-version: "{build}"
-
-before_build:
-  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
-
-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
@@ -1,6 +1,6 @@
 # NSIS file to create a self-installing exe for Vim.
 # It requires NSIS version 2.0 or later.
-# Last Change:	2014 Nov 5
+# Last Change:	2010 Jul 30

 # WARNING: if you make changes to this script, look out for $0 to be valid,
 # because uninstall deletes most files in $0.
@@ -38,7 +38,7 @@ SetDatablockOptimize on
 RequestExecutionLevel highest

 ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer."
-DirText "Choose a directory to install Vim (should contain 'vim')"
+DirText "Choose a directory to install Vim (must end in 'vim')"
 Icon icons\vim_16c.ico
 # NSIS2 uses a different strategy with six different images in a strip...
 #EnabledBitmap icons\enabled.bmp
@@ -135,6 +135,11 @@ 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
@@ -1,8 +1,8 @@
 " ---------------------------------------------------------------------
 " getscript.vim
 "  Author:	Charles E. Campbell
-"  Date:	Jan 21, 2014
-"  Version:	36
+"  Date:	Apr 17, 2013
+"  Version:	35
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
 "
@@ -15,7 +15,7 @@
 if exists("g:loaded_getscript")
 finish
 endif
-let g:loaded_getscript= "v36"
+let g:loaded_getscript= "v35"
 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
@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2014 Nov 05
+" Last Change: 2008 Jul 04

 " These functions are used by the gzip plugin.

@@ -120,8 +120,6 @@ 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
@@ -148,10 +146,8 @@ 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
-  elseif s:check(a:cmd)
+  if s:check(a:cmd)
    " Rename the file before compressing it.
    let nm = resolve(expand("<afile>"))
    let nmt = s:tempname(nm)
@@ -1,49 +1,7 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" 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
+" Last Change:	2011 Apr 28

 function! htmlcomplete#CompleteTags(findstart, base)
  if a:findstart
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		Dec 30, 2014
+" Date:		May 03, 2013
 " Maintainer:	Charles E Campbell <drchipNOSPAM at campbellfamily dot biz>
-" Version:	15
+" Version:	14a	ASTRO-ONLY
 " 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 = "v15"
+let g:loaded_netrwSettings = "v14a"
 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#SavePosn()
+  call netrw#NetrwSavePosn()
  if !exists("g:loaded_netrw")
   echohl WarningMsg | echomsg "***sorry*** netrw needs to be loaded prior to using NetrwSettings" | echohl None
   return
@@ -98,11 +98,6 @@ 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
@@ -177,7 +172,6 @@ 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
@@ -1,78 +0,0 @@
-" 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
@@ -1,7 +1,7 @@
 "python3complete.vim - Omni Completion for python
 " Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
 " Version: 0.9
-" Last Updated: 18 Jun 2009 (small fix 2015 Sep 14 from Debian)
+" Last Updated: 18 Jun 2009
 "
 " Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
 "
@@ -359,7 +359,6 @@ 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)
@@ -377,7 +377,6 @@ 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)
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2013 Sep 03
+" Last Change: 2013 Jun 19
 "
 " 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
@@ -36,14 +36,6 @@ 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".

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

 hi clear

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

 " Normal should come first
 hi Normal     guifg=Black  guibg=White
@@ -28,11 +28,7 @@ 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
-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 Search     ctermfg=NONE	   ctermbg=Yellow guibg=Yellow guifg=NONE
 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
@@ -1,40 +0,0 @@
-" 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    	
-
@@ -1,133 +0,0 @@
-" MacVim colorscheme
-"
-" Maintainer:   Bjorn Winckler <bjorn.winckler@gmail.com>
-" Last Change:  2008 May 9
-"
-" This is the default MacVim color scheme.  It supports both light and dark
-" backgrounds (see :h 'background').
-"
-
-
-highlight clear
-
-" Reset String -> Constant links etc if they were reset
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "macvim"
-
-
-"
-" First list all groups common to both 'light' and 'dark' background.
-"
-
-" `:he highlight-groups`
-hi DiffAdd      guibg=MediumSeaGreen
-hi Directory    guifg=#1600FF
-hi ErrorMsg     guibg=Firebrick2 guifg=White
-hi FoldColumn   guibg=Grey guifg=DarkBlue
-hi Folded       guibg=#E6E6E6 guifg=DarkBlue
-hi IncSearch    gui=reverse
-hi ModeMsg      gui=bold
-hi MoreMsg      gui=bold guifg=SeaGreen4
-hi NonText      gui=bold guifg=Blue
-hi Pmenu        guibg=LightSteelBlue1
-hi PmenuSbar    guibg=Grey
-hi PmenuSel     guifg=White guibg=SkyBlue4
-hi PmenuThumb   gui=reverse
-hi Question     gui=bold guifg=Chartreuse4
-hi SignColumn   guibg=Grey guifg=DarkBlue
-hi SpecialKey   guifg=Blue
-hi SpellBad     guisp=Firebrick2 gui=undercurl
-hi SpellCap     guisp=Blue gui=undercurl
-hi SpellLocal   guisp=DarkCyan gui=undercurl
-hi SpellRare    guisp=Magenta gui=undercurl
-hi StatusLine   gui=NONE guifg=White guibg=DarkSlateGray
-hi StatusLineNC gui=NONE guifg=SlateGray guibg=Gray90
-hi TabLine      gui=underline guibg=LightGrey
-hi TabLineFill  gui=reverse
-hi TabLineSel   gui=bold
-hi Title        gui=bold guifg=DeepSkyBlue3
-hi VertSplit    gui=NONE guifg=DarkSlateGray guibg=Gray90
-if has("gui_macvim")
-  hi Visual       guibg=MacSelectedTextBackgroundColor
-else
-  hi Visual       guibg=#72F7FF
-endif
-hi WarningMsg   guifg=Firebrick2
-
-" Syntax items (`:he group-name` -- more groups are available, these are just
-" the top level syntax items for now).
-hi Error        gui=NONE guifg=White guibg=Firebrick3
-hi Identifier   gui=NONE guifg=Aquamarine4 guibg=NONE
-hi Ignore       gui=NONE guifg=bg guibg=NONE
-hi PreProc      gui=NONE guifg=DodgerBlue3 guibg=NONE
-hi Special      gui=NONE guifg=BlueViolet guibg=NONE
-hi String       gui=NONE guifg=SkyBlue4 guibg=NONE
-hi Underlined   gui=underline guifg=SteelBlue1
-
-
-"
-" Groups that differ between 'light' and 'dark' background.
-"
-
-if &background == "dark"
-  hi Boolean      gui=NONE guifg=DeepPink4 guibg=NONE
-  hi Comment      gui=italic guifg=CadetBlue3
-  hi Constant     gui=NONE guifg=Goldenrod1 guibg=NONE
-  hi Cursor       guibg=LightGoldenrod guifg=bg
-  hi CursorColumn guibg=Gray20
-  hi CursorIM     guibg=LightSlateGrey guifg=bg
-  hi CursorLine   guibg=Gray20
-  hi DiffChange   guibg=MediumPurple4
-  hi DiffDelete   gui=bold guifg=White guibg=SlateBlue
-  hi DiffText     gui=NONE guifg=White guibg=SteelBlue
-  hi LineNr       guifg=#552A7B guibg=Grey5
-  hi MatchParen   guifg=White guibg=Magenta
-  hi Normal       guifg=Grey50 guibg=Grey10
-  hi Search       guibg=Blue4 guifg=NONE
-  hi Statement    gui=bold guifg=Purple1 guibg=NONE
-  hi Todo         gui=NONE guifg=Green4 guibg=DeepSkyBlue1
-  hi Type         gui=bold guifg=Cyan4 guibg=NONE
-  hi WildMenu     guibg=SkyBlue guifg=White
-  hi lCursor      guibg=LightSlateGrey guifg=bg
-else
-  hi Boolean      gui=NONE guifg=Red3 guibg=NONE
-  hi Comment      gui=italic guifg=Blue2 guibg=NONE
-  hi Constant     gui=NONE guifg=DarkOrange guibg=NONE
-  hi Cursor       guibg=fg guifg=bg
-  hi CursorColumn guibg=#F1F5FA
-  hi CursorIM     guibg=fg guifg=bg
-  hi CursorLine   guibg=#F1F5FA
-  hi DiffChange   guibg=DeepSkyBlue
-  hi DiffDelete   gui=bold guifg=Black guibg=SlateBlue
-  hi DiffText     gui=NONE guibg=Gold
-  hi LineNr       guifg=#888888 guibg=#E6E6E6
-  hi MatchParen   guifg=White guibg=MediumPurple1
-  if has("gui_macvim")
-    hi Normal       gui=NONE guifg=MacTextColor guibg=MacTextBackgroundColor
-  else
-    hi Normal       gui=NONE guifg=Black guibg=White
-  endif
-  hi Search       guibg=CadetBlue1 guifg=NONE
-  hi Statement    gui=bold guifg=Maroon guibg=NONE
-  hi Todo         gui=NONE guifg=DarkGreen guibg=PaleGreen1
-  hi Type         gui=bold guifg=Green4 guibg=NONE
-  hi WildMenu     guibg=SkyBlue guifg=Black
-  hi lCursor      guibg=fg guifg=bg
-endif
-
-
-"
-" Change the selection color on focus change (but only if the "macvim"
-" colorscheme is active).
-"
-if has("gui_macvim") && !exists("s:augroups_defined")
-  au FocusLost * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSecondarySelectedControlColor | endif
-  au FocusGained * if exists("colors_name") && colors_name == "macvim" | hi Visual guibg=MacSelectedTextBackgroundColor | endif
-
-  let s:augroups_defined = 1
-endif
-
-" vim: sw=2
@@ -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')
@@ -1,29 +0,0 @@
-" 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
@@ -1,7 +1,7 @@
 " Vim compiler file
-" Compiler:	Microsoft Visual C
+" Compiler:	Miscrosoft Visual C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Sep 20
+" Last Change:	2005 Nov 30

 if exists("current_compiler")
  finish
@@ -75,7 +75,6 @@ DOCS = \
 	pattern.txt \
 	pi_getscript.txt \
 	pi_gzip.txt \
-	pi_logipat.txt \
 	pi_netrw.txt \
 	pi_paren.txt \
 	pi_spec.txt \
@@ -208,7 +207,6 @@ HTMLS = \
 	pattern.html \
 	pi_getscript.html \
 	pi_gzip.html \
-	pi_logipat.html \
 	pi_netrw.html \
 	pi_paren.html \
 	pi_spec.html \
@@ -231,6 +229,7 @@ HTMLS = \
 	starting.html \
 	syntax.html \
 	tabpage.html \
+	tags.html \
 	tagsrch.html \
 	term.html \
 	tips.html \
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.4.  Last change: 2015 Aug 18
+*autocmd.txt*   For Vim version 7.4.  Last change: 2013 Aug 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -259,7 +259,6 @@ 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
@@ -279,7 +278,6 @@ 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
@@ -306,9 +304,6 @@ 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
@@ -467,16 +462,6 @@ 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
@@ -495,19 +480,11 @@ 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
@@ -522,11 +499,6 @@ 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).
@@ -581,15 +553,11 @@ 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 or when the size of the file changes.
-				|timestamp|
+				change. |timestamp|
 				Mostly triggered after executing a shell
 				command, but also with a |:checktime| command
 				or when Gvim regains input focus.
@@ -689,8 +657,6 @@ 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
@@ -745,29 +711,6 @@ 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|,
@@ -788,7 +731,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
@@ -959,13 +902,6 @@ 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
@@ -1072,7 +1008,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 BufNewFile * au CursorHold <buffer=abuf>  echo 'hold'
+    :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: >
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.4.  Last change: 2015 Oct 17
+*change.txt*    For Vim version 7.4.  Last change: 2013 Jul 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -156,9 +156,6 @@ 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*
@@ -379,43 +376,10 @@ 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.
@@ -432,10 +396,6 @@ 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".
@@ -515,8 +475,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
-'#' 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).
+'#', 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
@@ -634,9 +594,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',
-			'i', 'I' 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' 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
@@ -863,38 +823,8 @@ 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-\=* *s/\=*
+						*sub-replace-\=*
 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.
@@ -936,13 +866,13 @@ This replaces each 'E' character with a euro sign.  Read more in |<Char->|.
 :promptf[ind] [string]
 			Put up a Search dialog.  When [string] is given, it is
 			used as the initial search string.
-			{only for Win32, Motif, GTK and MacVim GUI}
+			{only for Win32, Motif and GTK GUI}

 						*:promptr* *:promptrepl*
 :promptr[epl] [string]
 			Put up a Search/Replace dialog.  When [string] is
 			given, it is used as the initial search string.
-			{only for Win32, Motif, GTK and MacVim GUI}
+			{only for Win32, Motif and GTK GUI}


 4.4 Changing tabs					*change-tabs*
@@ -1139,11 +1069,6 @@ 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
@@ -1165,17 +1090,16 @@ 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 ten types of registers:			*registers* *E354*
+There are nine 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. 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 "/
+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 "/

 1. Unnamed register ""				*quote_quote* *quotequote*
 Vim fills this register with text deleted with the "d", "c", "s", "x" commands
@@ -1202,8 +1126,6 @@ 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.
@@ -1221,7 +1143,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*
@@ -1232,6 +1154,8 @@ 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.
@@ -1240,33 +1164,16 @@ 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.

-7. Expression register "=			*quote_=* *quote=* *@=*
+6. 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-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
+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
 expression (like with the "/" command).

 The expression must evaluate to a String.  A Number is always automatically
@@ -1279,7 +1186,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}

-8. Selection and drop registers "*, "+ and "~ 
+7. 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
@@ -1301,17 +1208,17 @@ GTK GUI}
 Note: The "~ register is only used when dropping plain text onto Vim.
 Drag'n'drop of URI lists is handled internally.

-9. Black hole register "_				*quote_*
+8. 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}

-10. Last search pattern register	"/			*quote_/* *quote/*
+9. 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 value is restored when returning from a function
+Note that the valued is restored when returning from a function
 |function-search-undo|.
 {not in Vi}

@@ -1526,10 +1433,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 matching 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 maching 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
@@ -1733,7 +1640,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()|, |uniq()|.
+found here: |sort()|.

 							*:sor* *:sort*
 :[range]sor[t][!] [i][u][r][n][x][o] [/{pattern}/]
@@ -1800,8 +1707,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 obeys the current locale.  You will have to try it out.
-Vim does do a "stable" sort.
+guarantee that sorting is "stable" or obeys the current locale.  You will have
+to try it out.

 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
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.4.  Last change: 2015 Sep 25
+*cmdline.txt*   For Vim version 7.4.  Last change: 2013 Mar 16


 		  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: 50).
+(default: 20).
 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
@@ -356,10 +356,6 @@ 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*

@@ -511,8 +507,6 @@ followed by another Vim command:
    :argdo
    :autocmd
    :bufdo
-    :cdo
-    :cfdo
    :command
    :cscope
    :debug
@@ -523,8 +517,6 @@ followed by another Vim command:
    :help
    :helpfind
    :lcscope
-    :ldo
-    :lfdo
    :make
    :normal
    :perl
@@ -601,7 +593,6 @@ 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
@@ -754,16 +745,15 @@ 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 effects of special characters in a Vim script
-you may want to use |fnameescape()|.  Also see |`=|.
+Note: If you want to avoid the special characters in a Vim script you may want
+to use |fnameescape()|.


 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()|.
+function expand() |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_##*
@@ -795,7 +785,6 @@ it, no matter how many backslashes.
 	   #			alternate.file
 	   \#			#
 	   \\#			\#
-Also see |`=|.

 			       *:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
 			       *:<sfile>* *<sfile>* *:<afile>* *<afile>*
@@ -817,21 +806,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}[{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.
+		   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.
 	<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* *::S*
-     *%:8* *%:p* *%:.* *%:~* *%:h* *%:t* *%:r* *%:e* *%:s* *%:gs* *%:S*
+	 *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs*
+	        *%:8* *%:p* *%:.* *%:~* *%:h* *%:t* *%:r* *%:e* *%:s* *%:gs*
 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|
@@ -886,10 +875,6 @@ 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": >
@@ -939,8 +924,9 @@ 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).
-Unless in |restricted-mode|, backticks work also, like in >
+Backticks also work, 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.
@@ -951,7 +937,6 @@ 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
@@ -978,8 +963,6 @@ 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*
@@ -1092,9 +1075,6 @@ 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

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.4.  Last change: 2014 Mar 27
+*develop.txt*   For Vim version 7.4.  Last change: 2013 Apr 27


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -19,6 +19,7 @@ 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.

 ==============================================================================
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.4.  Last change: 2015 Nov 01
+*diff.txt*      For Vim version 7.4.  Last change: 2013 Jul 07


 		  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,18 +123,13 @@ 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.  Resets related
-		options also when 'diff' was not set.
+:diffo[ff]	Switch off diff mode for the current window.

 :diffo[ff]!	Switch off diff mode for the current window and in all windows
-		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.
+		in the current tab page where 'diff' is set.

-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.
+The ":diffoff" command resets the relevant options to the values they had when
+using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode.
 Otherwise they are set to their default value:

 	'diff'		off
@@ -182,8 +177,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.

-							*:dif* *:diffupdate*
-:dif[fupdate][!]		Update the diff highlighting and folds.
+							*:diffu* *:diffupdate*
+:diffu[pdate][!]		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
@@ -267,17 +262,13 @@ that the buffers will be equal within the specified range.
 		See below for [range].

 							*do*
-[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".
+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.

 							*dp*
-[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".
+dp		Same as ":diffput" without argument or range.
+		Note: this doesn't work in Visual mode.


 When no [range] is given, the diff at the cursor position or just above it is
@@ -315,19 +306,6 @@ 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*

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.4.  Last change: 2014 Jun 19
+*digraph.txt*   For Vim version 7.4.  Last change: 2011 Jan 15


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

-	Equals			=	Cyrillic (= used as second char) 
+	Equals			=	Cyrillic
 	Asterisk		*	Greek
 	Percent sign		%	Greek/Cyrillic special
 	Plus			+	smalls: Arabic, capitals: Hebrew
@@ -170,11 +170,6 @@ 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)
@@ -971,8 +966,6 @@ 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
@@ -1084,7 +1077,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
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.4.  Last change: 2015 Aug 25
+*editing.txt*   For Vim version 7.4.  Last change: 2013 Aug 03


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -38,7 +38,6 @@ 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
@@ -304,8 +303,7 @@ 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. Escaped
-			spaces "\ " are reduced to a single space.
+			punctuation characters ".,:;!" are ignored.
 			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.
@@ -412,38 +410,25 @@ 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 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.
+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.
 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 as an
-external command, by putting an equal sign right after the first backtick,
-e.g.: >
+You can have the backticks expanded as a Vim expression, instead of an
+external command, by using the syntax `={expr}` 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',
@@ -623,10 +608,7 @@ list of the current window.
 			{not in Vi}

 :[count]arga[dd] {name} ..			*:arga* *:argadd* *E479*
-:[count]arga[dd]
-			Add the {name}s to the argument list.  When {name} is
-			omitted add the current buffer name to the argument
-			list.
+			Add the {name}s 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.
@@ -636,8 +618,7 @@ list of the current window.
 				:argadd x	a b x c
 				:0argadd x	x a b c
 				:1argadd x	a x b c
-				:$argadd x	a b c x
-				:+2argadd y	a b c x y
+				:99argadd x	a b c x
 			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.
@@ -659,19 +640,11 @@ 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.
-			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.
+:{range}argd[elete]	Delete the {range} files from the argument list.
 			When the last number in the range is too high, up to
-			the last argument is deleted.
+			the last argument is deleted.  Example: >
+				:10,1000argdel
+<			Deletes arguments 10 and further, keeping 1-9.
 			{not in Vi} {not available when compiled without the
 			|+listcmds| feature}

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

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

 Example: >
 	:args *.c
@@ -1105,12 +1076,9 @@ 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 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.
+: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.

 :cq[uit]		Quit always, without writing, and return an error
 			code.  See |:cq|.  Used for Manx's QuickFix mode (see
@@ -1377,7 +1345,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 a line.  When writing the
+- To insert a <NL> character in the file split up 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
@@ -1393,22 +1361,11 @@ 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 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.
+":!filter" or using ":w !command" the text is not encrypted, this may reveal
+it to others.  The 'viminfo' file is not encrypted.

 WARNING: If you make a typo when entering the key and then write the file and
 exit, the text will be lost!
@@ -1435,23 +1392,18 @@ 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: >
-	:setlocal cm=zip        " weak method, backwards compatible
-	:setlocal cm=blowfish   " method with flaws
-	:setlocal cm=blowfish2  " medium strong method
-
+of these two: >
+	:setlocal cm=zip       " weak method, backwards compatible
+	:setlocal cm=blowfish  " 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 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.
-
+To set the default method, used for new files, use one of these in your
+|vimrc| file: >
+	set cm=zip
+	set cm=blowfish
 The message given for reading and writing a file will show "[crypted]" when
-using zip, "[blowfish]" when using blowfish, etc.
+using zip, "[blowfish]" when using blowfish.

 When writing an undo file, the same key and method will be used for the text
 in the undo file. |persistent-undo|.
@@ -1486,7 +1438,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'.
@@ -1510,25 +1462,20 @@ 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, 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).
+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).

-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.
+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.

 							*E321* *E462*
 If you want to automatically reload a file when it has been changed outside of
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.4.  Last change: 2015 Aug 29
+*farsi.txt*     For Vim version 7.4.  Last change: 2010 Aug 07


 		  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:
 	¡  stands for Farsi PSP (break without space)

-	¢  stands for Farsi PCN (for HAMZE attribute)
+	¢  stands for Farsi PCN (for HAMZE attribute )

 Restrictions
 ------------
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.4.  Last change: 2013 Dec 15
+*filetype.txt*  For Vim version 7.4.  Last change: 2013 May 25


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -447,25 +447,23 @@ 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* %p%c\n\n", which produces
+			The default is "%d  %u\n\n\t* %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
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.4.  Last change: 2013 Dec 04
+*fold.txt*      For Vim version 7.4.  Last change: 2010 May 13


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -285,10 +285,9 @@ 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 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.
+		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.
 		This only works when 'foldmethod' is "manual" or "marker".
 		Also see |fold-delete-marker|.

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

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

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

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

 							*zR*
 zR		Open all folds.  This sets 'foldlevel' to highest fold level.
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.4.  Last change: 2014 Mar 08
+*gui.txt*       For Vim version 7.4.  Last change: 2013 Jun 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -25,8 +25,8 @@ Other GUI documentation:

 First you must make sure you actually have a version of Vim with the GUI code
 included.  You can check this with the ":version" command, it says "with xxx
-GUI", where "xxx" is Macvim, X11-Motif, X11-Athena, Photon, GTK, GTK2, etc.,
-or "MS-Windows 32 bit GUI version".
+GUI", where "xxx" is X11-Motif, X11-Athena, Photon, GTK, GTK2, etc., or
+"MS-Windows 32 bit GUI version".

 How to start the GUI depends on the system used.  Mostly you can run the
 GUI version of Vim with:
@@ -93,7 +93,7 @@ and initialize other things that you may want to set up differently from the
 terminal version.

 Recommended place for your personal GUI initializations:
-	Unix and Mac OS X   $HOME/.gvimrc or $HOME/.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
@@ -133,7 +133,6 @@ 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.
@@ -152,11 +151,8 @@ 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 these commands: >
+window Vim is running in with this command: >
 	:!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
@@ -692,10 +688,9 @@ because the item will never be selected.  Use a single colon to keep it
 simple.

 							*gui-toolbar*
-The toolbar is currently available in the MacVim, Win32, Athena, Motif, GTK+
-(X11), and Photon GUI.  It should turn up in other GUIs in due course.  The
-default toolbar is setup in menu.vim.  (Note: The MacVim toolbar is modified
-in "$VIM/gvimrc".)
+The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11),
+and Photon GUI.  It should turn up in other GUIs in due course.  The
+default toolbar is setup in menu.vim.
 The display of the toolbar is controlled by the 'guioptions' letter 'T'.  You
 can thus have menu & toolbar together, or either on its own, or neither.
 The appearance is controlled by the 'toolbar' option.  You can choose between
@@ -932,9 +927,9 @@ a menu item - you don't need to do a :tunmenu as well.

 5.9 Popup Menus

-In the Win32, MacVim, and GTK+ GUI, you can cause a menu to popup at the
-cursor.  This behaves similarly to the PopUp menus except that any menu tree
-can be popped up.
+In the Win32 and GTK+ GUI, you can cause a menu to popup at the cursor.
+This behaves similarly to the PopUp menus except that any menu tree can
+be popped up.

 This command is for backwards compatibility, using it is discouraged, because
 it behaves in a strange way.
@@ -943,7 +938,7 @@ it behaves in a strange way.
 :popu[p] {name}			Popup the menu {name}.  The menu named must
 				have at least one subentry, but need not
 				appear on the menu-bar (see |hidden-menus|).
-				{only available for Win32, MacVim, and GTK GUI}
+				{only available for Win32 and GTK GUI}

 :popu[p]! {name}		Like above, but use the position of the mouse
 				pointer instead of the cursor.
@@ -997,8 +992,6 @@ This section describes other features which are related to the GUI.
 		:set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*
 	    elseif has("gui_win32")
 		:set guifont=Luxi_Mono:h12:cANSI
-	    elseif has("gui_macvim")
-	        :set guifont=DejaVu\ Sans\ Mono:h13
 	    endif
 	endif

@@ -1,823 +0,0 @@
-*gui_mac.txt*	For Vim version 7.4.  Last change: 2012 Jan 13
-
-
-		  VIM REFERENCE MANUAL    by Bjorn Winckler
-
-
-The MacVim Graphical User Interface			*macvim* *gui-macvim*
-
- 1. MacVim differences		|macvim-differences|
- 2. Starting MacVim		|macvim-start|
- 3. Preferences			|macvim-preferences|
- 4. Special colors		|macvim-colors|
- 5. Menus			|macvim-menus|
- 6. Toolbar			|macvim-toolbar|
- 7. Dialogs			|macvim-dialogs|
- 8. System services		|macvim-services|
- 9. mvim:// URL handler		|macvim-url-handler|
-10. Keyboard shortcuts		|macvim-shortcuts|
-11. Trackpad gestures		|macvim-gestures|
-12. International		|macvim-international|
-13. Known bugs/missing features	|macvim-todo|
-14. Hints			|macvim-hints|
-
-Other relevant documentation:
-|gui.txt|	For generic items of the GUI.
-
-{Vi does not have a GUI}
-
-==============================================================================
-1. MacVim differences					*macvim-differences*
-
-One of the goals of MacVim is to make Vim behave like a proper Mac OS X
-application.  For this reason MacVim behaves slightly different from other GUI
-ports of Vim.  Most of the modifications are provided in the system gvimrc
-file; you can quickly open this file and look at it yourself by typing: >
-	:tabe $VIM/gvimrc
-Note that this file will be overwritten each time you update MacVim, so it is
-best to keep your own modifications inside "~/.gvimrc".
-
-							*macvim-windows*
-There is some confusion regarding the term "window" in MacVim since it means
-one thing to Vim and another to MacVim.  A "window" in Vim is what opens up
-when you type ":sp", whereas a "window" in MacVim is the GUI window which
-contains the text view, scrollbars, toolbar and tabline.  To avoid confusion,
-the former is referred to as a Vim-window, whereas the latter is simply called
-a window.
-
-							*macvim-encoding*
-It is not possible to modify 'termencoding' in MacVim; this option is forcibly
-set to "utf-8".  The option 'encoding' also defaults to "utf-8" (as opposed to
-"latin1" in the other GUI ports).
-
-Note: UTF-8 can represent all characters defined in Unicode, which includes
-all characters in all other standard encodings, so it should be perfectly safe
-to edit files in any encoding while 'encoding' is set to "utf-8".  Of course,
-you may need to set 'fileencodings' to auto-detect the encoding of the files
-you edit, or force the detection with |++enc| on the command line.
-
-However, if you are editing files that use multiple encodings (container
-formats like MIME or Unix mbox files) or no standard encoding (binary data,
-see also |edit-binary|), you may want to prevent MacVim from re-encoding the
-file at all. In this situation, you will need to set both 'encoding' and
-'fileencodings' to a simple single-byte encoding such as Latin1 so that when
-the file is read into memory, the original bytes are left untouched.
-
-							*macvim-shift-movement*
-Text editors on Mac OS X lets the user hold down shift+movement key to extend
-the selection.  Also, pressing a printable key whilst selecting replaces the
-current selection with that character.  MacVim can emulate this kind of
-behaviour (by providing key bindings and by setting 'keymodel' and
-'selectmode' to non-default values) although it is not enabled by default.  To
-make MacVim behave more like TextEdit and less like Vim, add the following
-lines to your "~/.vimrc" (not .gvimrc) file: >
-	if has("gui_macvim")
-	  let macvim_hig_shift_movement = 1
-	endif
-<
-							*macvim-drag-n-drop*
-Dragging files and dropping them on a window opens those files in tabs in that
-window, unless Vim is in command-line mode.  In command-line mode the names of
-the files are added to the command line.  Holding down modifier keys whilst
-dragging is not supported.
-
-If a file is dropped on the Dock icon, it is always opened in a new tab
-regardless of the mode Vim is currently in.  The same holds if you
-double-click on a file in the Finder.
-
-The "Open files from applications" preference in the General preference pane
-gives more options on how dropped files should open, in case tabs are not
-desired.
-
-							*macvim-default-menu*
-The default menu in MacVim has been changed to conform better with the Apple
-Human Interface Guidelines (HIG).  At the moment this breaks the localized
-menus, so only English menus are supported.
-
-Note: The menus are a work in progress.  If you know something about the HIG
-and want to contribute to MacVim you could do so by making the menus better.
-
-							*macvim-window-title*
-The default window title does not include the argument list because it looks
-really bad once you start using tabs.  For example, dropping two files, then
-dropping two more, and switching back to the first tab would cause weird
-strings like "((3) of 2)" to appear in the window title.
-
-							*macvim-tablabel*
-Tab labels only show the tail of the file name to make the tabs more readable
-when editing files in deeply nested folders.  Add the line "set guitablabel="
-to your .gvimrc file to revert back to the default Vim tab label.
-
-							*macvim-options*
-These are the non-standard options that MacVim supports:
-	'antialias'	'blurradius'	'fullscreen'
-	'fuoptions'	'macligatures'	'macmeta'	'toolbariconsize'
-	'transparency'
-
-							*macvim-commands*
-These are the non-standard commands that MacVim supports:
-	|:macaction|	|:macmenu|
-
-							*macvim-find*
-Whenever you search for something in Vim (e.g. using "/") the search query is
-copied to the OS X "Find Pasteboard".  The idea is that if you search for
-something and switch to another application, then you can hit <D-g> (or <D-G>)
-to repeat the search in the new app.  The same feature works if you search in
-some app, switch to MacVim and hit <D-g>.
-
-Note that the command |n| is not the same as <D-g>.  The former will repeat
-the last search made in Vim, whereas the latter searches for the string on the
-OS X Find Pasteboard using the action findNext: (see |:macaction|).
-
-The <D-g> key equivalent is a great way to bring a search from one window to
-another in MacVim.  Simply search for something in one window (using "/") then
-switch to another (e.g. with <D-`>) and hit <D-g> and the search will be
-repeated in the new window.
-
-					*macvim-backspace* *macvim-delete*
-The 'backspace' option is set in the system vimrc to make the delete key
-behave in a more familiar way to new users.  If you dislike this non-default
-behaviour, then add the line "set backspace&" to your "~/.vimrc" file.
-
-==============================================================================
-2. Starting MacVim					*macvim-start*
-
-The easiest way to start MacVim is by double-clicking its icon in the Finder,
-but most users will probably prefer to use the Terminal.  First some Finder
-related ways of starting MacVim are described, then Terminal is discussed.
-Note that you can put MacVim anywhere on your hard drive, but in this help
-file it is assumed that you have put it inside your /Applications folder.
-
-MacVim automatically registers itself as an editor of several standard file
-formats.  This enables you to double-click a file to open it with MacVim (if
-it is not associated with another program), or to right-click a file to bring
-up the "Open with" menu.  You can also drag and drop files onto the Dock icon
-to open them in tabs in a new window, or you can drop them in an already open
-window to open the files in tabs in that specific window (it is possible to
-have files open in e.g. splits by changing the "Open files from applications"
-option in the General preference pane).  Finally, you can use Mac OS X System
-Services to open files in MacVim, see |macvim-services|.
-
-There are essentially two ways to start MacVim from Terminal: either call the
-Vim binary with the -g switch >
-	/Applications/MacVim.app/Contents/MacOS/Vim -g file ...
-or use the "open" command (this method can not be used to pass parameters to
-Vim) >
-	open -a MacVim file ...
-The advantage of using the latter method is that the settings relating to file
-opening in the preferences panel are respected, and files open instantly if
-|Quickstart| is enabled.
-
-To save yourself from having to type the entire path to the Vim binary each
-time you start MacVim, you could create an alias such as >
-	alias gvim='/Applications/MacVim.app/Contents/MacOS/Vim -g'
-and add that to "~/.profile".
-
-Note: Do NOT call the MacVim binary inside the app bundle to start MacVim.
-
-							*mvim*
-A more flexible way to start MacVim is to use the shell script "mvim" which
-comes bundled with MacVim.  Put this script in a folder in your path and then
-simply type "mvim" to start MacVim.  This script will try to find MacVim.app
-in various typical folders such as >
-	~/Applications              ~/Applications/vim
-	/Applications               /Applications/vim
-	/Applications/Utilities     /Applications/Utilities/vim
-If you would rather put MacVim.app in some other directory then that is also
-possible, simply set the environment variable VIM_APP_DIR to whatever folder
-you have placed MacVim.app in.
-
-The "mvim" script can be symlinked to in order to start up MacVim in different
-modes as follows (assuming you placed "mvim" in "/usr/local/bin"): >
-	* Diff:		ln -s /usr/local/bin/mvim mvimdiff
-	* Read-only:	ln -s /usr/local/bin/mvim mview
-	* Ex:		ln -s /usr/local/bin/mvim mex
-	* Restricted:	ln -s /usr/local/bin/mvim rmvim
-If the symlink destination starts with "m" (or "g"), Vim will start in GUI
-mode.  Removing the initial "m" from the above destination names makes Vim
-start without the GUI.  (In the last case, the destination name can be
-"rmvim", "rgvim" or "rvim".)
-
-Note: Starting MacVim by creating a symlink to >
-	.../MacVim.app/Contents/MacOS/Vim
-with 'ln -s' does not work.
-
-Once in terminal Vim it is possible to start MacVim by using the following
-command:
-	:gui [++opt] [+cmd] [-f|-b] [files...]
-Note: Forking ("-b") currently does not work.
-
-							*Quickstart*
-Quickstart ensures that new windows open instantaneously e.g. when <D-n> is
-pressed.  This feature can be enabled from the Advanced preferences pane (it
-is disabled by default).  Note that this setting does not affect the speed
-with which windows open when using the |mvim| command.
-
-Note that any changes to runtime files that are kept in a non-standard
-location (i.e. not in ~/.vim) will not be picked up for the first window that
-opens after any changes.  Also, there are some issues related to reading and
-writing of the |viminfo| file which can lead to the command line history
-appearing to be lost (as well as any other information stored in the |viminfo|
-file).  For example, if you open a window, edit some files then close the
-window, then the next window that opens will not have the same command line
-history as the window you just closed (however the next window you open will).
-For these reasons Quickstart is disabled by default.
-
-						*odbeditor* *external-editor*
-MacVim can act as an 'external editor' for Mac OS X applications that support
-the ODB Editor Protocol (or the 'external editor' protocol).  Each application
-has different ways of configuring this option, check the application's
-documentation.  Once configured properly MacVim can be used to open files in
-such an application.
-
-A technical note: MacVim handles file open, modified and closed events.  In
-the open event the FTok and Burl parameters are parsed (the latter is ignored
-at the moment though).  In the modified and closed events the Tokn parameter
-is sent back to the server application.
-
-==============================================================================
-3. Preferences				    *macvim-prefs* *macvim-preferences*
-
-Some settings are global to the MacVim application and would not make sense as
-Vim options.  These settings are stored in the user defaults database and can
-be accessed via the "MacVim.Preferences..." menu item.
-
-							*macvim-user-defaults*
-Not all entries in the user defaults database are exposed via the preference
-panel, usually because they should not be changed by the user under normal
-circumstances.  These options can still be changed with the "defaults" command
-by opening Terminal and typing >
-	defaults write org.vim.MacVim KEY VALUE
-Check the man page on "defaults" for more information on this command as well
-as general information regarding Mac OS X user defaults.
-
-Here is a list of relevant dictionary entries:
-
-KEY				VALUE ~
-MMCellWidthMultiplier		width of a normal glyph in em units [float]
-MMDialogsTrackPwd		open/save dialogs track the Vim pwd [bool]
-MMLoginShellArgument		login shell parameter [string]
-MMLoginShellCommand		which shell to use to launch Vim [string]
-MMNoFontSubstitution		disable automatic font substitution [bool]
-MMShowAddTabButton		enable "add tab" button on tabline [bool]
-MMTabMaxWidth			maximum width of a tab [int]
-MMTabMinWidth			minimum width of a tab [int]
-MMTabOptimumWidth		default width of a tab [int]
-MMTextInsetBottom		text area offset in pixels [int]
-MMTextInsetLeft			text area offset in pixels [int]
-MMTextInsetRight		text area offset in pixels [int]
-MMTextInsetTop			text area offset in pixels [int]
-MMTexturedWindow		use brushed metal window (Tiger only) [bool]
-MMTranslateCtrlClick		interpret ctrl-click as right-click [bool]
-MMVerticalSplit			files open in vertical splits [bool]
-MMZoomBoth			zoom button maximizes both directions [bool]
-
-As an example, if you have more than one mouse button and would wish to free
-up Ctrl-click so you can bind it to something else, then the appropriate
-command is: >
-	defaults write org.vim.MacVim MMTranslateCtrlClick 0
-
-If you wish to restore all user defaults to their starting values, open
-Terminal and type: >
-	defaults delete org.vim.MacVim
-<
-							*macvim-login-shell*
-Applications opened from the Finder do not automatically source the user's
-environment variables (which are typically set in .profile or .bashrc).  This
-presents a problem when using |:!| to execute commands in the shell since e.g.
-$PATH might not be set properly.  To work around this problem MacVim starts
-new Vim processes via a login shell so that all environment variables are set.
-
-By default MacVim uses the $SHELL environment variable to determine which
-shell to use (if $SHELL is not set "/bin/bash" is used).  It is possible to
-override this choice by setting the user default MMLoginShellCommand to the
-shell that should be used (e.g. "/bin/tcsh").  MacVim tries to make the shell
-a login shell by prepending argv[0] with a dash.  If you use an exotic shell
-and need to pass it a parameter to make it a login shell then you can set the
-user default MMLoginShellArgument (e.g. to "-l").  Finally, if the "bash"
-shell is used, then "-l" is automatically added as an argument.  To override
-this behaviour set MMLoginShellArgument to "--".
-
-==============================================================================
-4. Special colors					*macvim-colors*
-
-The colors in MacVim are defined in two dictionaries inside the "Resources"
-folder of the application bundle (MacVim.app/Contents/Resources).  It is
-possible to add more colors by modifying these files.  Color names are case
-insensitive when accessed from Vim, but in the dictionary they must be
-lowercase.
-
-							*SystemColors.plist*
-There are only a few system colors that can be accessed from Vim.  These
-colors are defined in the dictionary "SystemColors.plist".  This dictionary
-stores (key, value) pairs where the key is the name of the color and the
-value is an NSColor selector name.
-
-The most useful system colors are: >
-	MacSelectedTextBackgroundColor
-	MacSecondarySelectedColor
-The former is the "Highlight Color" which can be changed in the "Appearance"
-section of the System Preferences.  The latter is the selection color used by
-a Cocoa application when it is not in focus.
-
-							*Colors.plist*
-Apart from the system colors, it is also possible to use the standard X11
-color names (see http://en.wikipedia.org/wiki/X11_color_names) which usually
-come in a file called "rgb.txt".  MacVim does not have such a file, instead it
-keeps these colors in a dictionary called "Colors.plist". The key in this
-dictionary is the name of the color and the value is an RGB value on the form
-#rrggbb stored as an integer.
-
-							*macvim-colorscheme*
-MacVim ships with a custom color scheme that is used instead of the default
-Vim color scheme.  The color scheme can be changed with >
-	:colorscheme macvim
-If you prefer a dark background color, then type >
-	:set bg=dark
-after having loaded the "macvim" color scheme.
-
-Use the |:colorscheme| command if you want to use another color scheme.  Note
-that if you want to set syntax highlight colors manually, then you must either
-create your own color scheme or add the line >
-	let macvim_skip_colorscheme=1
-to your ~/.vimrc (~/.gvimrc will not work).  Otherwise the "macvim" color
-scheme will be loaded when the system gvimrc file is sourced and mess up your
-changes.
-
-The color scheme uses the system "Highlight Color", which can be changed in
-the "Appearance" pane of the System Preferences.  It also changes the
-highlight color when a window becomes inactive.
-
-==============================================================================
-5. Menus						*macvim-menus*
-
-Menus in Mac OS X behave slightly different from other platforms.  For that
-reason two new commands have been added to Vim.  To understand what these
-commands do you must first understand how menus work on OS X.
-
-Each entry in a menu is called a "menu item".  With each menu item is
-associated: a title, a key equivalent and an action message.  When a menu is
-displayed the title is shown on the left and the key equivalent (if any) is
-shown on the right.  Key equivalents enable you to access a menu item using
-the keyboard instead of having to use the mouse.  When a menu item is clicked
-it will send it's associated action message.  Actions can be used to instruct
-MacVim to paste some text (paste:), open a new window (newWindow:), etc.
-Certain actions are standard throughout OS X which is why MacVim must be able
-to set these for each menu item.  (E.g. the menu item "Edit.Paste" must be
-bound to the action "paste:" otherwise pasting won't work in dialogs since
-that is the action that instructs them to paste something.)
-
-Menus are configured using the |:macmenu| command and the |:macaction| command
-can be used to send action messages.
-
-						*:maca* *:macaction*
-:maca[ction] {action:}	Send the message "action:" to the first responder.
-			The list of allowed actions can be seen by typing
-			    :maca <C-d>
-			An attempt to send an action not listed here will
-			result in an error.  This list is specified in a
-			property list file called |Actions.plist|.
-
-						*:macm* *:macmenu*
-:macm[enu] {menu} {key}={arg} ...
-			Set Mac specific properties for {menu}.  The
-			properties that can be set are:
-			    action	the action this menu sends
-			    alt		"yes" if alternate of previous menu
-			    key		the key equivalent of this menu
-			This command must be used in a startup file, for
-			example in "~/.gvimrc".  It has no effect otherwise.
-
-			For convenience, a menu with "action=name:" which is
-			bound to <Nop> will act as if bound to
-			":maca name:<CR>".  Thus, if "Menu.Item" is given by
-			    :an Menu.Item <Nop>
-			    :macm Menu.Item action=name:
-			then ":emenu Menu.Item" is equivalent to
-			":maca name:".
-
-			The key equivalent is specified with the <D-..>
-			syntax.  This is case-sensitive, so <D-a> means Cmd-a
-			whereas <D-A> means Cmd-Shift-a.
-			Note that key equivalents must contain the Cmd
-			modifier flag (<D-..>), and they take precedence over
-			normal mappings.
-			Use the syntax "key=<nop>" to clear the key equivalent
-			of a menu.  This can be used to free up a key
-			combination that is set in the system gvimrc so that
-			it may be mapped to using ":map".
-
-			Recognised values of "alt" are "0", "no", "1", and
-			"yes".  The default is "no".  An alternate menu must
-			have the same key equivalent as the previous menu,
-			except the modifier flags must differ.  The alternate
-			menu is by default hidden and only shows up when the
-			modifier is held down.
-
-Here are some examples on how to use these commands:
-
-1. Create a menu item with title "New Window" under the "File" menu, with key
-equivalent Cmd-n, which opens a new window when selected: >
-	:an 10.290 File.New\ Window <Nop>
-	:macm File.New\ Window action=newWindow: key=<D-n>
-2. Change the key equivalent to cycle through tabs to Cmd-Left/Right: >
-	:macm Window.Previous\ Tab  key=<D-Left>
-	:macm Window.Next\ Tab	    key=<D-Right>
-3. Create a mapping in normal mode which closes the current tab/window: >
-	:map <C-w> :maca performClose:<CR>
-4. Free up Cmd-t and remap it to open a file browser in a split view: >
-	macm File.New\ Tab key=<nop>
-	nmap <D-t> :sp .<CR>
-Note: These two lines must be added to .gvimrc else the first line will fail.
-The second line is case sensitive, so <D-T> (Cmd-Shift-t) is not the same as
-<D-t> (Cmd-t)!
-
-The default menus are set up in "$VIMRUNTIME/menu.vim".  Take a look at that
-file for more examples on how to set up menus.  Note: When no window is open a
-minimal default menu is used.  The default menu is set up in MainMenu.nib
-which resides in "Resources/English.lproj/" folder inside the app bundle.
-
-							*Actions.plist*
-Some action messages would not be suitable to call from within Vim, so there
-is a dictionary called "Actions.plist" (in the Resources folder of the
-application bundle) which contains all actions that may be called.  The key in
-this dictionary is the name of the action message (case sensitive), the value
-is not used.
-
-Hint: The |:macaction| command supports command-line completion so you can
-enter ":maca<Space><C-d>" to see a list of all available actions.
-
-Here is a random assortment of actions from Actions.plist which might be
-useful.  
-
-Action				Description ~
-fileOpen:			Show "File Open" dialog
-findNext:			Search forward using the "Find Pasteboard"
-findPrevious:			Search backward using the "Find Pasteboard"
-fontSizeDown:			Decrease font size
-fontSizeUp:			Increase font size
-hide:				Hide MacVim
-miniaturizeAll:			Minimize all windows to the dock
-newWindow:			Open a new (empty) window
-orderFrontCharacterPalette:	Show the the "Special Characters" dialog
-orderFrontFontPanel:		Show the Font panel
-orderFrontPreferencePanel:	Show the Preferences panel
-performMiniaturize:		Minimize window to the dock
-performZoom:			Zoom window (same as clicking the green blob)
-terminate:			Quit MacVim
-zoomAll:			Zoom all windows
-_cycleWindows:			Select next window (similar to <D-`>)
-_cycleWindowsBackwards:		Select previous window (similar to <D-S-`>)
-
-==============================================================================
-6. Toolbar						*macvim-toolbar*
-
-The toolbar in MacVim works just like in the other GUIs (see |gui-toolbar|),
-with the addition of two separator items (see |menu-separator|).  You can use
-them as follows: >
-	:an ToolBar.-space1-        <Nop>
-	:an ToolBar.-flexspace2-    <Nop>
-The first example creates an empty space on the toolbar, the second creates an
-empty space which will shink or expand so that the items to the right of it
-are right-aligned.  A space (flexspace) will be created for any toolbar item
-whose name begins with "-space" ("-flexspace") and ends with "-"
-
-Toolbar icons should be tiff, png or icns, of dimension 32x32 or 24x24 pixels.
-The larger size is used when 'tbis' is "medium" or "large", otherwise the
-smaller size is used (which is the default).  If the icon file only contains
-one dimension then Mac OS X will scale the icon to the appropriate dimension
-if necessary.  To avoid this, use a file format which supports multiple
-resolutions (such as icns) and provide both 32x32 and 24x24 versions of the
-icon.
-
-Note: Only a subset of the builtin toolbar items presently have icons.  If no
-icon can be found a warning triangle is displayed instead.
-
-==============================================================================
-7. Dialogs						*macvim-dialogs*
-
-Dialogs can be controlled with the keyboard in two ways.  By default each
-button in a dialog is bound to a key.  The button that is highlighted by blue
-is bound to Enter, any button with the title "Cancel" is bound to Escape, and
-any button with the title "Don't Save" is bound to <D-d>.  Other buttons are
-usually bound to the first letter in the title of the button.  There is no
-visual feedback to indicate which letter a button is bound to, so sometimes
-some experimentation might be required in order to figure out which key to
-press.
-
-The second way of controlling dialogs with the keyboard is to enable "Full
-keyboard access" in the "Keyboard" pane of the System Preferences (you can
-also toggle this on or off by pressing Ctrl-F7).  Once keyboard access is
-enabled it is possible to move between buttons with Tab and pressing Space to
-select the current button.  The current button is indicated with a blue
-outline.
-
-==============================================================================
-8. System services					*macvim-services*
-
-MacVim supports two system services.  These can be accessed from the MacVim
-submenu in the Services menu or by right-clicking a selection.  For services
-to work, MacVim.app should be located in the /Applications folder.  (You might
-have to logout and then login again before Mac OS X detects the MacVim
-services.)
-
-These are the currently supported services:
-	* New MacVim Buffer With Selection: Create a new buffer and paste the
-	  currently selected text.
-	* New MacVim Buffer Here: Create a new buffer and set the current
-	  directory to the file or folder that is selected in the Finder.
-
-The services respect the "Open files from applications" setting in the general
-preferences.
-
-==============================================================================
-9. mvim:// URL handler				*mvim://* *macvim-url-handler*
-
-MacVim supports a custom URL handler for "mvim://" URLs. The handler is
-supposed to be compatible to TextMate's URL scheme as documented at >
-	http://blog.macromates.com/2007/the-textmate-url-scheme/.
-
-Currently, this means that the format is >
-	mvim://open?<arguments>
-where "arguments" can be:
-	* url — the actual file to open (i.e. a file://... URL), if you leave
-		out this argument, the frontmost document is implied
-	* line — line number to go to (one based)
-	* column — column number to go to (one based)
-
-For example, the link >
-	mvim://open?url=file:///etc/profile&line=20
-will open the file /etc/profile on line 20 when clicked in a web browser.
-
-Note that url has to be a file:// url pointing to an existing local file.
-
-==============================================================================
-10. Keyboard shortcuts					*macvim-shortcuts*
-
-Most keyboard shortcuts in MacVim are bound to menu items and can be
-discovered by looking through the menus (see |macvim-menus| on how to create
-your own menu shortcuts, see |cmd-key| on how to map your own commands to
-Cmd-key shortcuts).  The remaining shortcuts are listed here:
-
-							*Cmd-.* *<D-.>*
-Cmd-.			Interrupt Vim.  Unlike Ctrl-C which is sent as normal
-			keyboard input (and hence has to be received and then
-			interpreted) this sends a SIGINT signal to the Vim
-			process.  Use this shortcut if the Vim process appears
-			to have locked up and is not responding to key presses.
-			This Cmd-key combination cannot be unmapped.
-
-							*Cmd-`* *<D-`>*
-Cmd-`			Cycle to the next window.  On an American keyboard the
-			`-key is located under the Esc-key.  On European
-			keyboards this key is often adjacent to the left
-			Shift-key and it may be not even be marked with "`".
-			This Cmd-key combination can only be unmapped via the
-			"Keyboard" System Preferences.
-
-							*Cmd-Left*  *<D-Left>*
-Cmd-Left		Move cursor to the beginning of the line
-			(see |cmd-movement|).
-
-							*Cmd-Right* *<D-Right>*
-Cmd-Right		Move cursor to the end of the line (see |cmd-movement|).
-
-							*Cmd-Up*    *<D-Up>*
-Cmd-Up			Move cursor to the first line (see |cmd-movement|).
-
-							*Cmd-Down*  *<D-Down>*
-Cmd-Down		Move cursor to the last line (see |cmd-movement|).
-
-							*Alt-Left*  *<M-Left>*
-Alt-Left		Move cursor to the beginning of the previous word
-			(see |alt-movement|).
-
-							*Alt-Right* *<M-Right>*
-Alt-Right		Move cursor to the beginning of the next word
-			(see |alt-movement|).
-
-							*Alt-Up*    *<M-Up>*
-Alt-Up			Move cursor one paragraph forward (see |alt-movement|).
-
-							*Alt-Down*  *<M-Down>*
-Alt-Down		Move cursor to the previous paragraph
-			(see |alt-movement|).
-
-						*cmd-movement* *alt-movement*
-The above mappings involving Cmd/Alt + arrow key are enabled by default in the
-system gvimrc file "$VIM/gvimrc".  You can quickly disable all of these by
-adding the following lines to your "~/.vimrc" (not .gvimrc) file: >
-	if has("gui_macvim")
-	  let macvim_skip_cmd_opt_movement = 1
-	endif
-Note: These are the only key mappings that MacVim makes (not counting menu key
-equivalents which are not set up with :map).
-
-See |macvim-shift-movement| if you want Shift to select text when used in
-conjunction with the above Cmd/Alt movement shortcuts.
-
-						*cmd-key* *cmd-shortcuts*
-Creating key mappings that involve the Cmd key (<D-..> in Vim notation) can
-sometimes be slightly involved.  Here are all the things you need to consider:
-
- Make sure the shortcut is not used by a menu item by looking through the
-  menus.  If it is then you need to unbind it before you can map to it.  This
-  is described under the help for the |:macmenu| command.
- Bindings to <D-..> are case sensitive: <D-d> is not the same as <D-D>.  If
-  you want to map something to Cmd+Shift+d, then you need to use <D-D>, not
-  <D-S-d> or <D-S-D>.
- Some command key shortcuts are reserved by Mac OS X and cannot be mapped to
-  (e.g. <D-Tab>).  However, some of these shortcuts can be freed up in the
-  System Preferences under Keyboard (e.g. Cmd+Space).
- A few command key mappings are set up by MacVim, see |cmd-movement|.
-
-==============================================================================
-11. Trackpad gestures					*macvim-gestures*
-
-MacVim supports trackpad swipe gestures.  By default this can be used to
-navigate back/forward in the help (try it!).
-
-Each gesture generates one of the following Vim pseudo keys:
-
-						 *<SwipeLeft>* *<SwipeRight>*
-	Generated when swiping three fingers across the trackpad in a
-	horizontal direction.  The Apple Magic Mouse generates these
-	events when swiping two fingers in a horizontal direction.
-
-						 *<SwipeUp>*   *<SwipeDown>*
-	Generated when swiping three fingers across the trackpad in a
-	vertical direction.  (Not supported by the Apple Magic Mouse.)
-
-You can map these keys like with any other key using the |:map| family of
-commands.  For example, the following commands map left/right swipe to change
-to the previous/next tab in normal mode: >
-
-	nmap <SwipeLeft> gT
-	nmap <SwipeRight> gt
-
-As another example, here is how to switch buffers by swiping left/right: >
-
-	nmap <SwipeLeft> :bN<CR>
-	nmap <SwipeRight> :bn<CR>
-
-See the section on |key-mapping| for more help on how to map keys.
-
-==============================================================================
-12. International					*macvim-international*
-
-When editing non-English text it may be convenient to keep separate keyboard
-layouts for normal and insert mode.  This is supported via the 'imd' option on
-Mac OS X 10.5 or later (on 10.4 the 'imd' option support is not as useful as
-it only switches between Roman and non-Roman input sources and it has been
-known not to work very reliably).
-
-For example: When 'noimd' is enabled (i.e. IM is enabled) the input source is
-saved when toggling between normal and insert mode, so you can use a US layout
-in normal mode then switch to insert mode and choose a Swedish layout.  When
-you go back to normal mode the US layout will be selected and when you enter
-insert mode the Swedish layout is selected.  This also works when searching
-for text etc. see 'imc', 'imi', 'ims'.
-
-Note that the layout used in normal mode is the layout used when 'noimd' is
-set (i.e when IM is enabled).  If you find that MacVim switches to the
-wrong layout when going back to normal mode, then select the layout you want
-to use in normal mode and type ":set imd" followed by ":set noimd".
-
-==============================================================================
-13. Known bugs/missing features				*macvim-todo*
-
-This list is by no means exhaustive, it only enumerates some of the more
-prominent bugs/missing features.
-
- Localized menus are not supported.  Choosing anything but "English" in the
-  "International" pane of "System Prefences" may break the menus (and
-  toolbar).
- Some Unicode characters are not handled well (e.g. nonspacing marks)
- Sometimes multibyte characters look "too wide", i.e. they overlap the
-  following character.  It might help to change 'ambiwidth', or override the
-  automatic font substitution by setting 'guifontwide' manually.
- Printing.  As a temporary solution <D-p> creates a PostScript file which is
-  then opened in Preview where it may be printed.
- The toolbar looks ugly and is not very useful.
-
-If you find new bugs then please post your findings to the vim_mac mailing
-list:							*vim_mac*   >
-	http://groups.google.com/group/vim_mac
-
-This is also the best place for making feature requests as well as for asking
-general questions about MacVim.
-
-==============================================================================
-14. Hints						*macvim-hints*
-
-In this section some general (not necessarily MacVim specific) hints are
-given.
-
-Scenario: ~
-You try opening a bunch of files in tabs but not all files get opened in their
-own tab.
-Solution: ~
-To get around this, set 'tabpagemax' to something big in your .gvimrc file
-(e.g. ":set tabpagemax=100").
-
-Scenario: ~
-You want to open a file in a tab in an already opened window, but typing "mvim
-filename" in Terminal opens it up in a separate window.
-Solution: ~
-Use the |--remote-tab| switch.  If you have several windows open you might
-have to specify which window you want the file to open in by using the
-|--servername| switch.  The title of a window usually ends in something like
-"VIM" or "VIM3" --- this is the server name of that window.  So to open a file
-named "foobar.txt" in a window whose title ends in "VIM3" you would type (the
-order of the arguments matters): >
-	mvim --servername VIM3 --remote-tab foobar.txt
-For more information, consult the |client-server| manual page.
-
-Scenario: ~
-You like to be able to select text by holding down shift and pressing the
-arrow keys and find the Vim way of selecting text strange.
-Solution: ~
-See |macvim-shift-movement|.
-
-Scenario: ~
-You do not want MacVim to set up any key mappings.
-Solution: ~
-See |cmd-movement|.
-
-Scenario: ~
-Enabling localized menus breaks the toolbar and the menus as well.
-Solution: ~
-This is a known problem, see |macvim-todo|.
-
-Scenario: ~
-When you click the (green) zoom button you want the window to maximize
-horizontally as well as vertically.
-Solution: ~
-Hold down Cmd and click the zoom button.  If you prefer this to be the default
-action, then set the user default MMZoomBoth (see |macvim-prefs|).
-
-Scenario: ~
-Typing feels sluggish when the cursor is just before a right bracket (i.e.
-')', '}', or ']').
-Solution: ~
-Disable the "matchparen" plugin (see |matchparen|) by typing :NoMatchParen.
-If that helps, then you can permanently disable "matchparen" by adding the
-following line to your "~/.vimrc": >
-	let loaded_matchparen=1
-<
-Scenario: ~
-You want to use MacVim as an editor for some external application.
-Solution: ~
-If the external application lets you set a program to execute then something
-like "mvim -f" might be all you need (the "-f" switch ensures that the "mvim"
-script returns only after you close the editor window, otherwise "mvim"
-returns immediately). If the external program honors the EDITOR environment
-variable (e.g Git does this) then you may get away by adding the following
-line to your "~/.profile": >
-	export EDITOR='mvim -f'
-If you have not installed the "mvim" script in your path you can provide the
-path to the Vim binary instead.  Thus, if "MacVim.app" resides in the
-Applications folder then you would use the following line: >
-	export EDITOR='/Applications/MacVim.app/Contents/MacOS/Vim -g -f'
-
-Scenario: ~
-You have set MacVim to open from an external program and when you finish
-editing (by closing the MacVim window) you want the external program to regain
-focus.
-Solution: ~
-Use the VimLeave autocommand to hide MacVim when the window closes: >
-	au VimLeave * maca hide:
-Assuming your external program has a setting for which command to execute to
-bring up an editor, you would set that option to something like: >
-	mvim -f -c "au VimLeave * maca hide:"
-(See the above Scenario for an explanation of the "-f" switch.)
-
-Scenario: ~
-You would like to remap Caps Lock to Esc.
-Solution: ~
-The app "PCKeyboardHack" can be used to remap Caps Lock.  It is available as a
-free download from: >
-	http://pqrs.org/macosx/keyremap4macbook/extra.html
-On some Apple keyboards the Caps Lock key doesn't immediately register and
-this makes Caps Lock "drop" key presses.  To work around this problem go into
-the "Keyboard" System Preference and remap Caps Lock to Ctrl first (click the
-"Modifier Keys..." button).  This trick may also be necessary if the Caps Lock
-light turns on/off despite having remapped to Esc.
-
-Scenario: ~
-You have problems creating custom mappings involving the Cmd key.
-Solution: ~
-To bind to a key involving Cmd you use the "<D-..>" syntax.  Many Cmd-key
-mappings are already used by the menus so if your mapping doesn't work then
-the solution is usually to first unmap the menu binding (see |macvim-menus|,
-in particular read the end of that section).  Also see the section on
-|macvim-shortcuts| for some Cmd-key combinations which are not used by the
-menus but still need to be freed up before they can be used in custom bindings.
-
-Scenario: ~
-You can't find the information on MacVim you thought should be in this manual
-page.
-Solution: ~
-Post your question on the |vim_mac| mailing list and wait for an answer.
-
- vim:tw=78:sw=4:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.4.  Last change: 2014 Dec 20
+*gui_w32.txt*   For Vim version 7.4.  Last change: 2012 Aug 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -452,10 +452,9 @@ 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* *:sim*
+							*:simalt* *:si*
 :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
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.4.  Last change: 2014 Mar 08
+*gui_x11.txt*   For Vim version 7.4.  Last change: 2011 Sep 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -40,9 +40,6 @@ The "-f" option runs Vim in the foreground.
 The "-b" option runs Vim in the background (this is the default).
 Also see |++opt| and |+cmd|.

-Note: For technical reasons, MacVim always runs Vim in the foreground when
-using :gui.
-
 							*gui-fork*
 When the GUI is started, it does a fork() and exits the current process.
 When gvim was started from a shell this makes the shell accept further
@@ -55,18 +52,12 @@ When using "gvim -f" and then ":gui", Vim will run in the foreground.  The
 "-f" argument will be remembered.  To force running Vim in the background use
 ":gui -b".

-MacVim supports forking only when you're launching Vim. "mvim" and
-"mvim -f" work as expected: "mvim" launches the gui and forks, while "mvim -f"
-launches the gui but doesn't fork (see |mvim|). However, doing |:gui| in an
-already running vim will never fork in MacVim.
-
 "gvim --nofork" does the same as "gvim -f".
 								*E851* *E852*
 When starting the GUI fails Vim will try to continue running in the terminal.

 If you want the GUI to run in the foreground always, include the 'f'
-flag in 'guioptions'.  |-f|.  MacVim does not support this flag in
-'guioptions'.
+flag in 'guioptions'.  |-f|.

 ==============================================================================
 2. GUI Resources			*gui-resources* *.Xdefaults*
@@ -451,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: https://github.com/chrizel/Yzis.
+continues on Yzis: www.yzis.org.

 ==============================================================================
 8. Compiling						*gui-x11-compiling*
@@ -1,8 +1,11 @@
-*hangulin.txt*  For Vim version 7.4.  Last change: 2015 Nov 10
+*hangulin.txt*  For Vim version 7.4.  Last change: 2009 Jun 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*
 ------------
@@ -14,8 +17,7 @@ Compile
 -------
 Next is a basic option.  You can add any other configure option. >

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

 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
@@ -24,21 +26,18 @@ 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, ko_KR.eucKR
-or ko_KR.UTF-8.
+You should set LANG variable to Korean locale such as ko or ko_KR.euc.
 If you set LC_ALL variable, it should be set to Korean locale also.

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

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

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

 Hangul Fonts
 ------------
-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
+You can set text font using $HOME/.Xdefaults or in your gvimrc file.
+But to use Hangul, you should set 'guifontset' in your vimrc.

 $HOME/.Xdefaults: >
    Vim.font: english_font
@@ -75,38 +66,40 @@ $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 english
-font only in 'font' setting for syntax.
+After 'fontset' feature is enabled, VIM does not allow using 'font'.
 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 error message.  Be careful!
+then you can see a GOOD error message.  Be careful!

 hangul_font width should be twice than english_font width.

 Unsupported Feature
 -------------------
-We don't support Johab font.
-We don't support Hanja input.
-And We don't have any plan to support them.
+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.

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

 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:
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.4.  Last change: 2015 Jun 21
+*help.txt*	For Vim version 7.4.  Last change: 2012 Dec 06

 			VIM - main help file
 									 k
@@ -24,7 +24,6 @@ Get specific help:  It is possible to go directly to whatever you want help
 		      Command-line editing	  c_	   :help c_<Del>
 		      Vim command argument	  -	   :help -r
 		      Option			  '	   :help 'textwidth'
-		      Regular expression	  /	   :help /[
  Search for help:  Type ":help word", then hit CTRL-D to see matching
 		    help entries for "word".
 		    Or use ":helpgrep word". |:helpgrep|
@@ -156,7 +155,6 @@ GUI ~
 |gui_w16.txt|	Windows 3.1 GUI
 |gui_w32.txt|	Win32 GUI
 |gui_x11.txt|	X11 GUI
-|gui_mac.txt|	MacVim GUI

 Interfaces ~
 |if_cscop.txt|	using Cscope with Vim
@@ -198,7 +196,6 @@ Remarks about specific systems ~
 Standard plugins ~
 |pi_getscript.txt| Downloading latest version of Vim scripts
 |pi_gzip.txt|      Reading and writing compressed files
-|pi_logipat.txt|   Logical operators on patterns
 |pi_netrw.txt|     Reading and writing files over a network
 |pi_paren.txt|     Highlight matching parens
 |pi_tar.txt|       Tar file explorer
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 7.4.  Last change: 2014 Sep 19
+*helphelp.txt*	For Vim version 7.4.  Last change: 2012 Nov 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -96,9 +96,6 @@ Help on help files					*helphelp*
 			find a tag in a file with the same language as the
 			current file.  See |help-translated|.

-						 	*:helpc* *:helpclose*
-:helpc[lose]            Close one help window, if there is one.
-
 							*:helpg* *:helpgrep*
 :helpg[rep] {pattern}[@xx]
 			Search all help text files and make a list of lines
@@ -1,4 +1,4 @@
-*if_lua.txt*    For Vim version 7.4.  Last change: 2015 Oct 16
+*if_lua.txt*    For Vim version 7.4.  Last change: 2012 Jun 29


 		  VIM REFERENCE MANUAL    by Luis Carvalho
@@ -14,7 +14,6 @@ The Lua Interface to Vim				*lua* *Lua*
 6. Buffer userdata		|lua-buffer|
 7. Window userdata		|lua-window|
 8. The luaeval function		|lua-luaeval|
-9. Dynamic loading		|lua-dynamic|

 {Vi does not have any of these commands}

@@ -136,7 +135,7 @@ Vim evaluation and command execution, and others.
 <
 	vim.funcref({name})	Returns a Funcref to function {name} (see
 				|Funcref|). It is equivalent to Vim's
-				"function". NOT IMPLEMENTED YET
+				"function".

 	vim.buffer([arg])	If "arg" is a number, returns buffer with
 				number "arg" in the buffer list or, if "arg"
@@ -400,24 +399,5 @@ Examples: >
 	:echo Rand(1,10)


-==============================================================================
-9. Dynamic loading				    *lua-dynamic*
-
-On MS-Windows and Unix the Lua library can be loaded dynamically.  The
-|:version| output then includes |+lua/dyn|.
-
-This means that Vim will search for the Lua DLL or shared library file only
-when needed.  When you don't use the Lua interface you don't need it, thus
-you can use Vim without this file.
-
-On MS-Windows to use the Lua interface the Lua DLL must be in your search path.
-In a console window type "path" to see what directories are used.  The version
-of the DLL must match the Lua version Vim was compiled with.
-
-On Unix the 'luadll' option can be used to specify the Lua shared library file
-instead of DYNAMIC_LUA_DLL file what was specified at compile time.  The
-version of the shared library must match the Lua version Vim was compiled with.
-
-
 ==============================================================================
 vim:tw=78:ts=8:noet:ft=help:norl:
@@ -197,7 +197,7 @@ files in it.
 --remote-silent "+call cursor(10, 27)"
 	      - Places the cursor on line 10 column 27
 In Vim >
-   :h --remote-silent for more details
+   :h --remote-silent for mor details

 [.Net remarks provided by Dave Fishburn and Brian Sturk]

@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.4.  Last change: 2015 Oct 16
+*if_perl.txt*   For Vim version 7.4.  Last change: 2012 Oct 25


 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -290,13 +290,5 @@ The name of the DLL must match the Perl version Vim was compiled with.
 Currently the name is "perl512.dll".  That is for Perl 5.12.  To know for
 sure edit "gvim.exe" and search for "perl\d*.dll\c".

-
-Unix ~
-
-The 'perldll' option can be used to specify the Perl shared library file
-instead of DYNAMIC_PERL_DLL file what was specified at compile time.  The
-version of the shared library must match the Perl version Vim was compiled
-with.
-
 ==============================================================================
 vim:tw=78:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.4.  Last change: 2015 Nov 10
+*if_pyth.txt*   For Vim version 7.4.  Last change: 2013 Jul 10


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -28,7 +28,7 @@ Both can be available at the same time, but read |python-2-and-3|.
 ==============================================================================
 1. Commands						*python-commands*

-					*:python* *:py* *E263* *E264* *E887*
+					*:python* *:py* *E205* *E263* *E264*
 :[range]py[thon] {stmt}
 			Execute Python statement {stmt}.  A simple check if
 			the `:python` command is working: >
@@ -679,26 +679,20 @@ functions to evaluate Python expressions and pass their values to VimL.
 ==============================================================================
 9. Dynamic loading					*python-dynamic*

-On MS-Windows and Unix the Python library can be loaded dynamically.  The
-|:version| output then includes |+python/dyn| or |+python3/dyn|.
+On MS-Windows the Python library can be loaded dynamically.  The |:version|
+output then includes |+python/dyn|.

-This means that Vim will search for the Python DLL or shared library file only
-when needed.  When you don't use the Python interface you don't need it, thus
-you can use Vim without this file.
+This means that Vim will search for the Python DLL file only when needed.
+When you don't use the Python interface you don't need it, thus you can use
+Vim without this DLL file.

-On MS-Windows to use the Python interface the Python DLL must be in your search
-path.  In a console window type "path" to see what directories are used.
+To use the Python interface the Python DLL must be in your search path.  In a
+console window type "path" to see what directories are used.

 The name of the DLL must match the Python version Vim was compiled with.
 Currently the name is "python24.dll".  That is for Python 2.4.  To know for
 sure edit "gvim.exe" and search for "python\d*.dll\c".

-On Unix the 'pythondll' or 'pythonthreedll' option can be used to specify the
-Python shared library file instead of DYNAMIC_PYTHON_DLL or
-DYNAMIC_PYTHON3_DLL file what were specified at compile time.  The version of
-the shared library must match the Python 2.x or Python 3 version Vim was
-compiled with.
-
 ==============================================================================
 10. Python 3						*python3*

@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.4.  Last change: 2015 Oct 16
+*if_ruby.txt*   For Vim version 7.4.  Last change: 2012 Aug 02


 		  VIM REFERENCE MANUAL    by Shugo Maeda
@@ -120,13 +120,9 @@ VIM::command({cmd})
 							*ruby-evaluate*
 VIM::evaluate({expr})
 	Evaluates {expr} using the vim internal expression evaluator (see
-	|expression|).  Returns the expression result as:
-	- a Integer if the Vim expression evaluates to a number
-	- a Float if the Vim expression evaluates to a float
-	- a String if the Vim expression evaluates to a string
-	- a Array if the Vim expression evaluates to a Vim list
-	- a Hash if the Vim expression evaluates to a Vim dictionary
-	Dictionaries and lists are recursively expanded.
+	|expression|).  Returns the expression result as a string.
+	A |List| is turned into a string by joining the items and inserting
+	line breaks.

 ==============================================================================
 3. VIM::Buffer objects					*ruby-buffer*
@@ -199,8 +195,6 @@ This means that Vim will search for the Ruby DLL file or shared library only
 when needed.  When you don't use the Ruby interface you don't need it, thus
 you can use Vim even though this library file is not on your system.

-MS-Windows ~
-
 You need to install the right version of Ruby for this to work.  You can find
 the package to download from:
 http://www.garbagecollect.jp/ruby/mswin32/en/download/release.html
@@ -218,12 +212,5 @@ and comment-out the check for _MSC_VER.
 You may also need to rename the include directory name to match the version,
 strangely for Ruby 1.9.3 the directory is called 1.9.1.

-Unix ~
-
-The 'rubydll' option can be used to specify the Ruby shared library file
-instead of DYNAMIC_RUBY_DLL file what was specified at compile time.  The
-version of the shared library must match the Ruby version Vim was compiled
-with.
-
 ==============================================================================
 vim:tw=78:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.4.  Last change: 2014 Dec 06
+*indent.txt*    For Vim version 7.4.  Last change: 2013 Aug 03


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -545,12 +545,10 @@ The examples below assume a 'shiftwidth' of 4.
 	      (default 70 lines).

 								*cino-#*
-	#N    When N is non-zero recognize shell/Perl comments starting with
-	      '#', do not recognize preprocessor lines; allow right-shifting
-	      lines that start with "#".
-	      When N is zero (default): don't recognize '#' comments, do
-	      recognize preprocessor lines; right-shifting lines that start
-	      with "#" does not work.
+	#N    When N is non-zero recognize shell/Perl comments, starting with
+	      '#'.  Default N is zero: don't recognize '#' comments.  Note
+	      that lines starting with # will still be seen as preprocessor
+	      lines.


 The defaults, spelled out in full, are:
@@ -558,7 +556,7 @@ The defaults, spelled out in full, are:
 			c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0

 Vim puts a line in column 1 if:
- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#0'.
+- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'.
 - It starts with a label (a keyword followed by ':', other than "case" and
  "default") and 'cinoptions' does not contain an 'L' entry with a positive
  value.
@@ -583,8 +581,8 @@ CLOJURE					*ft-clojure-indent* *clojure-indent*

 Clojure indentation differs somewhat from traditional Lisps, due in part to
 the use of square and curly brackets, and otherwise by community convention.
-These conventions are not universally followed, so the Clojure indent script
-offers a few configurable options, listed below.
+These conventions are not always universally followed, so the Clojure indent
+script offers a few configurable options, listed below.

 If the current vim does not include searchpairpos(), the indent script falls
 back to normal 'lisp' indenting, and the following options are ignored.
@@ -598,6 +596,7 @@ without limits.
 	" Default
 	let g:clojure_maxlines = 100
 <
+
 						*g:clojure_fuzzy_indent*
 					*g:clojure_fuzzy_indent_patterns*
 					*g:clojure_fuzzy_indent_blacklist*
@@ -651,6 +650,7 @@ default list below.
 	let g:clojure_special_indent_words =
 	   \ 'deftype,defrecord,reify,proxy,extend-type,extend-protocol,letfn'
 <
+
 					*g:clojure_align_multiline_strings*

 Align subsequent lines in multiline strings to the column after the opening
@@ -675,28 +675,7 @@ This option is off by default.
 	" Default
 	let g:clojure_align_multiline_strings = 0
 <
-						*g:clojure_align_subforms*

-By default, parenthesized compound forms that look like function calls and
-whose head subform is on its own line have subsequent subforms indented by
-two spaces relative to the opening paren:
->
-	(foo
-	  bar
-	  baz)
-<
-Setting this option changes this behavior so that all subforms are aligned to
-the same column, emulating the default behavior of clojure-mode.el:
->
-	(foo
-	 bar
-	 baz)
-<
-This option is off by default.
->
-	" Default
-	let g:clojure_align_subforms = 0
-<

 FORTRAN							*ft-fortran-indent*

@@ -812,7 +791,7 @@ OPTIONS: ~
 PHP indenting can be altered in several ways by modifying the values of some
 global variables:

-					*php-comment* *PHP_autoformatcomment*
+								*php-comment*
 To not enable auto-formating of comments by default (if you want to use your
 own 'formatoptions'): >
    :let g:PHP_autoformatcomment = 0
@@ -821,7 +800,6 @@ Else, 't' will be removed from the 'formatoptions' string and "qrowcb" will be
 added, see |fo-table| for more information.
 -------------

-							*PHP_outdentSLComments*
 To add extra indentation to single-line comments: >
    :let g:PHP_outdentSLComments = N

@@ -833,7 +811,6 @@ Only single-line comments will be affected such as: >
    /* Comment */
 -------------

-							*PHP_default_indenting*
 To add extra indentation to every PHP lines with N being the number of
 'shiftwidth' to add: >
    :let g:PHP_default_indenting = N
@@ -853,18 +830,14 @@ For example, with N = 1, this will give:
 (Notice the extra indentation between the PHP container markers and the code)
 -------------

-							*PHP_outdentphpescape*
-To indent PHP escape tags as the surrounding non-PHP code (only affects the
-PHP escape tags): >
-:let g:PHP_outdentphpescape = 0
+To indent PHP tags as the surrounding code: >
+    :let g:PHP_outdentphpescape = 0
 -------------

-							*PHP_removeCRwhenUnix*
 To automatically remove '\r' characters when the 'fileformat' is set to Unix: >
    :let g:PHP_removeCRwhenUnix = 1
 -------------

-							*PHP_BracesAtCodeLevel*
 To indent braces at the same level than the code they contain: >
    :let g:PHP_BracesAtCodeLevel = 1
    
@@ -883,7 +856,6 @@ NOTE:	Indenting will be a bit slower if this option is used because some
 	optimizations won't be available.
 -------------

-							*PHP_vintage_case_default_indent*
 To indent 'case:' and 'default:' statements in switch() blocks: >
    :let g:PHP_vintage_case_default_indent = 1

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.4.  Last change: 2015 Sep 08
+*index.txt*     For Vim version 7.4.  Last change: 2013 Jul 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -702,16 +702,12 @@ tag		char	      note action in Normal mode	~
 |g'|		g'{mark}	1  like |'| but without changing the jumplist
 |g`|		g`{mark}	1  like |`| but without changing the jumplist
 |gstar|		g*		1  like "*", but without using "\<" and "\>"
-|g+|		g+		   go to newer text state N times
-|g,|		g,		1  go to N newer position in change list
-|g-|		g-		   go to older text state N times
 |g0|		g0		1  when 'wrap' off go to leftmost character of
 				   the current line that is on the screen;
 				   when 'wrap' on go to the leftmost character
 				   of the current screen line
 |g8|		g8		   print hex value of bytes used in UTF-8
 				   character under the cursor
-|g;|		g;		1  go to N older position in change list
 |g<|		g<		   display previous command output
 |g?|		g?		2  Rot13 encoding operator
 |g?g?|		g??		2  Rot13 encode current line
@@ -740,7 +736,6 @@ tag		char	      note action in Normal mode	~
 				   the screen; when 'wrap' on go to the
 				   leftmost non-white character of the current
 				   screen line
-|g_|		g_		1  cursor to the last CHAR N - 1 lines lower
 |ga|		ga		   print ascii value of character under the
 				   cursor
 |gd|		gd		1  go to definition of word under the cursor
@@ -1129,8 +1124,8 @@ tag	      command	      action ~
 |:cNfile|	:cNf[ile]	go to last error in previous file
 |:cabbrev|	:ca[bbrev]	like ":abbreviate" but for Command-line mode
 |:cabclear|	:cabc[lear]	clear all abbreviations for Command-line mode
-|:caddbuffer|	:cad[dbuffer]	add errors from buffer
-|:caddexpr|	:cadde[xpr]	add errors from expr
+|:caddbuffer|	:caddb[uffer]	add errors from buffer
+|:caddexpr|	:cad[dexpr]	add errors from expr
 |:caddfile|	:caddf[ile]	add error message to current quickfix list
 |:call|		:cal[l]		call a function
 |:catch|	:cat[ch]	part of a :try command
@@ -1138,8 +1133,6 @@ tag	      command	      action ~
 |:cc|		:cc		go to specific error
 |:cclose|	:ccl[ose]	close quickfix window
 |:cd|		:cd		change directory
-|:cdo|		:cdo		execute command in each valid error list entry
-|:cfdo|		:cfd[o]		execute command in each file in error list
 |:center|	:ce[nter]	format lines at the center
 |:cexpr|	:cex[pr]	read errors from expr and jump to first
 |:cfile|	:cf[ile]	read file with error messages and jump to first
@@ -1198,12 +1191,12 @@ tag	      command	      action ~
 |:digraphs|	:dig[raphs]	show or enter digraphs
 |:display|	:di[splay]	display registers
 |:djump|	:dj[ump]	jump to #define
-|:dl|		:dl		short for |:delete| with the 'l' flag
-|:dl|		:del[ete]l	short for |:delete| with the 'l' flag
+|:dl|		:dl		short for |:delete|
+|:dl|		:del[ete]l	short for |:delete|
 |:dlist|	:dli[st]	list #defines
 |:doautocmd|	:do[autocmd]	apply autocommands to current buffer
 |:doautoall|	:doautoa[ll]	apply autocommands for all loaded buffers
-|:dp|		:d[elete]p	short for |:delete| with the 'p' flag
+|:dp|		:d[elete]p	short for |:delete|
 |:drop|		:dr[op]		jump to window editing file or edit file in
 				current window
 |:dsearch|	:ds[earch]	list one #define
@@ -1251,7 +1244,6 @@ tag	      command	      action ~
 |:gvim|		:gv[im]		start the GUI
 |:hardcopy|	:ha[rdcopy]	send text to the printer
 |:help|		:h[elp]		open a help window
-|:helpclose|	:helpc[lose]	close one help window
 |:helpfind|	:helpf[ind]	dialog to open a help window
 |:helpgrep|	:helpg[rep]	like ":grep" but searches help files
 |:helptags|	:helpt[ags]	generate help tags for a directory
@@ -1283,7 +1275,6 @@ tag	      command	      action ~
 |:keepalt|	:keepa[lt]	following command keeps the alternate file
 |:keepmarks|	:kee[pmarks]	following command keeps marks where they are
 |:keepjumps|	:keepj[umps]	following command keeps jumplist and marks
-|:keeppatterns|	:keepp[atterns]	following command keeps search pattern history
 |:lNext|	:lN[ext]	go to previous entry in location list
 |:lNfile|	:lNf[ile]	go to last entry in previous file
 |:list|		:l[ist]		print lines
@@ -1298,8 +1289,6 @@ tag	      command	      action ~
 |:lchdir|	:lch[dir]	change directory locally
 |:lclose|	:lcl[ose]	close location window
 |:lcscope|	:lcs[cope]      like ":cscope" but uses location list
-|:ldo|		:ld[o]		execute command in valid location list entries
-|:lfdo|		:lfd[o]		execute command in each file in location list
 |:left|		:le[ft]		left align lines
 |:leftabove|	:lefta[bove]	make split window appear left or above
 |:let|		:let		assign a value to a variable or option
@@ -1344,8 +1333,6 @@ tag	      command	      action ~
 |:lwindow|	:lw[indow]	open or close location window
 |:move|		:m[ove]		move lines
 |:mark|		:ma[rk]		set a mark
-|:macation|	:maca[ction]	send action message
-|:macmenu|	:macm[enu]	set Mac specific properties for menu item
 |:make|		:mak[e]		execute external command 'makeprg' and parse
 				error messages
 |:map|		:map		show or enter a mapping
@@ -1373,14 +1360,13 @@ tag	      command	      action ~
 |:nmenu|	:nme[nu]	add menu for Normal mode
 |:nnoremap|	:nn[oremap]	like ":noremap" but for Normal mode
 |:nnoremenu|	:nnoreme[nu]	like ":noremenu" but for Normal mode
-|:noautocmd|	:noa[utocmd]	following commands don't trigger autocommands
+|:noautocmd|	:noa[utocmd]	following command don't trigger autocommands
 |:noremap|	:no[remap]	enter a mapping that will not be remapped
 |:nohlsearch|	:noh[lsearch]	suspend 'hlsearch' highlighting
 |:noreabbrev|	:norea[bbrev]	enter an abbreviation that will not be
 				remapped
 |:noremenu|	:noreme[nu]	enter a menu that will not be remapped
 |:normal|	:norm[al]	execute Normal mode commands
-|:noswapfile|	:nos[wapfile]	following commands don't create a swap file
 |:number|	:nu[mber]	print lines with line number
 |:nunmap|	:nun[map]	like ":unmap" but for Normal mode
 |:nunmenu|	:nunme[nu]	remove menu for Normal mode
@@ -1476,7 +1462,7 @@ tag	      command	      action ~
 				buffer list
 |:sbrewind|	:sbr[ewind]	split window and go to first file in the
 				buffer list
-|:scriptnames|	:scr[iptnames]	list names of all sourced Vim scripts
+|:scriptnames|	:scrip[tnames]	list names of all sourced Vim scripts
 |:scriptencoding| :scripte[ncoding]	encoding used in sourced Vim script
 |:scscope|	:scs[cope]	split window and execute cscope command
 |:set|		:se[t]		show or set options
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.4.  Last change: 2015 Sep 15
+*insert.txt*    For Vim version 7.4.  Last change: 2013 Jul 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -51,8 +51,6 @@ char		action	~
 		abbreviation.
 		Note: If your <Esc> key is hard to hit on your keyboard, train
 		yourself to use CTRL-[.
-		If Esc doesn't work and you are using a Mac, try CTRL-Esc.
-		Or disable Listening under Accessibility preferences.
 						*i_CTRL-C*
 CTRL-C		Quit insert mode, go back to Normal mode.  Do not check for
 		abbreviations.  Does not trigger the |InsertLeave| autocommand
@@ -81,11 +79,9 @@ CTRL-W		Delete the word before the cursor (see |i_backspacing| about
 		joining lines).  See the section "word motions",
 		|word-motions|, for the definition of a word.
 						*i_CTRL-U*
-CTRL-U		Delete all entered characters before the cursor in the current
-		line.  If there are no newly entered characters and
-		'backspace' is not empty, delete all characters before the
-		cursor in the current line.
-		See |i_backspacing| about joining lines.
+CTRL-U		Delete all entered characters in the current line (see
+		|i_backspacing| about joining lines).
+
 						*i_CTRL-I* *i_<Tab>* *i_Tab*
 <Tab> or CTRL-I Insert a tab.  If the 'expandtab' option is on, the
 		equivalent number of spaces is inserted (use CTRL-V <Tab> to
@@ -152,7 +148,7 @@ CTRL-R CTRL-R {0-9a-z"%#*+/:.-=}			*i_CTRL-R_CTRL-R*
 	CTRL-R a		results in "ac".
 	CTRL-R CTRL-R a		results in "ab^Hc".
 <		Options 'textwidth', 'formatoptions', etc. still apply.  If
-		you also want to avoid these, use CTRL-R CTRL-O, see below.
+		you also want to avoid these, use "<C-R><C-O>r", see below.
 		The '.' register (last inserted text) is still inserted as
 		typed.  {not in Vi}

@@ -377,9 +373,6 @@ CTRL-O		execute one command, return to Insert mode   *i_CTRL-O*
 CTRL-\ CTRL-O	like CTRL-O but don't move the cursor	     *i_CTRL-\_CTRL-O*
 CTRL-L		when 'insertmode' is set: go to Normal mode  *i_CTRL-L*
 CTRL-G u	break undo sequence, start new change	     *i_CTRL-G_u*
-CTRL-G U	don't break undo with next left/right cursor *i_CTRL-G_U*
-		movement (but only if the cursor stays
-		within same the line)
 -----------------------------------------------------------------------

 Note: If the cursor keys take you out of Insert mode, check the 'noesckeys'
@@ -419,28 +412,6 @@ that, with CTRL-O u.  Another example: >
 This breaks undo at each line break.  It also expands abbreviations before
 this.

-An example for using CTRL-G U: >
-
-	inoremap <Left>  <C-G>U<Left>
-	inoremap <Right> <C-G>U<Right>
-	inoremap <expr> <Home> col('.') == match(getline('.'), '\S') + 1 ?
-	 \ repeat('<C-G>U<Left>', col('.') - 1) :
-	 \ (col('.') < match(getline('.'), '\S') ?
-	 \     repeat('<C-G>U<Right>', match(getline('.'), '\S') + 0) :
-	 \     repeat('<C-G>U<Left>', col('.') - 1 - match(getline('.'), '\S')))
-	inoremap <expr> <End> repeat('<C-G>U<Right>', col('$') - col('.'))
-	inoremap ( ()<C-G>U<Left>
-
-This makes it possible to use the cursor keys in Insert mode, without breaking
-the undo sequence and therefore using |.| (redo) will work as expected. 
-Also entering a text like (with the "(" mapping from above): >
-
-   Lorem ipsum (dolor
-
-will be repeatable by the |.|to the expected
-
-   Lorem ipsum (dolor)
-
 Using CTRL-O splits undo: the text typed before and after it is undone
 separately.  If you want to avoid this (e.g., in a mapping) you might be able
 to use CTRL-R = |i_CTRL-R|.  E.g., to call a function: >
@@ -1331,7 +1302,7 @@ HTML							*ft-html-omni*
 XHTML							*ft-xhtml-omni*

 CTRL-X CTRL-O provides completion of various elements of (X)HTML files.  It is
-designed to support writing of XHTML 1.0 Strict files but will also work for
+designed to support writing of XHTML 1.0 Strict files but will also works for
 other versions of HTML. Features:

 - after "<" complete tag name depending on context (no div suggestion inside
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.4.  Last change: 2015 Jan 20
+*intro.txt*     For Vim version 7.4.  Last change: 2013 Jun 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -135,11 +135,10 @@ http://www.vim.org/maillist.php

 Bug reports:				*bugs* *bug-reports* *bugreport.vim*

-Send bug reports to: Vim Developers <vim-dev@vim.org>
-This is a maillist, you need to become a member first and many people will see
-the message.  If you don't want that, e.g. because it is a security issue,
-send it to <bugs@vim.org>, this only goes to the Vim maintainer (that's Bram).
-
+Send bug reports to: Vim Developers <vim_dev@vim.org>
+This is a maillist, many people will see the message.  If you don't want that,
+e.g. because it is a security issue, send it to <bugs@vim.org>, this only goes
+to the Vim maintainer (that's Bram).
 Please be brief; all the time that is spent on answering mail is subtracted
 from the time that is spent on improving Vim!  Always give a reproducible
 example and try to find out which settings or other things influence the
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4.  Last change: 2014 Dec 08
+*map.txt*       For Vim version 7.4.  Last change: 2013 Aug 03


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -60,17 +60,17 @@ modes.
 			{rhs}, is then further scanned for mappings.  This
 			allows for nested and recursive use of mappings.

-						*:nore* *:norem*
-:no[remap]  {lhs} {rhs}		|mapmode-nvo|	*:no*  *:noremap* *:nor*
-:nn[oremap] {lhs} {rhs}		|mapmode-n|	*:nn*  *:nnoremap*
-:vn[oremap] {lhs} {rhs}		|mapmode-v|	*:vn*  *:vnoremap*
-:xn[oremap] {lhs} {rhs}		|mapmode-x|	*:xn*  *:xnoremap*
-:snor[emap] {lhs} {rhs}		|mapmode-s|	*:snor* *:snoremap*
-:ono[remap] {lhs} {rhs}		|mapmode-o|	*:ono* *:onoremap*
-:no[remap]! {lhs} {rhs}		|mapmode-ic|	*:no!* *:noremap!*
-:ino[remap] {lhs} {rhs}		|mapmode-i|	*:ino* *:inoremap*
-:ln[oremap] {lhs} {rhs}		|mapmode-l|	*:ln*  *:lnoremap*
-:cno[remap] {lhs} {rhs}		|mapmode-c|	*:cno* *:cnoremap*
+
+:no[remap]  {lhs} {rhs}		|mapmode-nvo|		*:no*  *:noremap*
+:nn[oremap] {lhs} {rhs}		|mapmode-n|		*:nn*  *:nnoremap*
+:vn[oremap] {lhs} {rhs}		|mapmode-v|		*:vn*  *:vnoremap*
+:xn[oremap] {lhs} {rhs}		|mapmode-x|		*:xn*  *:xnoremap*
+:snor[emap] {lhs} {rhs}		|mapmode-s|		*:snor* *:snoremap*
+:ono[remap] {lhs} {rhs}		|mapmode-o|		*:ono* *:onoremap*
+:no[remap]! {lhs} {rhs}		|mapmode-ic|		*:no!* *:noremap!*
+:ino[remap] {lhs} {rhs}		|mapmode-i|		*:ino* *:inoremap*
+:ln[oremap] {lhs} {rhs}		|mapmode-l|		*:ln*  *:lnoremap*
+:cno[remap] {lhs} {rhs}		|mapmode-c|		*:cno* *:cnoremap*
 			Map the key sequence {lhs} to {rhs} for the modes
 			where the map command applies.  Disallow mapping of
 			{rhs}, to avoid nested and recursive mappings.  Often
@@ -306,21 +306,9 @@ is disabled.  This makes it possible to map zero without making it impossible
 to type a count with a zero.

 						*map-overview* *map-modes*
-Overview of which map command works in which mode.  More details below.
-     COMMANDS                    MODES ~
-:map   :noremap  :unmap     Normal, Visual, Select, Operator-pending
-:nmap  :nnoremap :nunmap    Normal
-:vmap  :vnoremap :vunmap    Visual and Select
-:smap  :snoremap :sunmap    Select
-:xmap  :xnoremap :xunmap    Visual
-:omap  :onoremap :ounmap    Operator-pending
-:map!  :noremap! :unmap!    Insert and Command-line
-:imap  :inoremap :iunmap    Insert
-:lmap  :lnoremap :lunmap    Insert, Command-line, Lang-Arg
-:cmap  :cnoremap :cunmap    Command-line
+Overview of which map command works in which mode:

-
-    COMMANDS				      MODES ~
+    commands:				      modes: ~
 				       Normal  Visual+Select  Operator-pending ~
 :map   :noremap   :unmap   :mapclear	 yes	    yes		   yes
 :nmap  :nnoremap  :nunmap  :nmapclear	 yes	     -		    -
@@ -336,7 +324,7 @@ NOTE: Mapping a printable character in Select mode may confuse the user.  It's
 better to explicitly use :xmap and :smap for printable characters.  Or use
 :sunmap after defining the mapping.

-    COMMANDS				      MODES ~
+    commands:				      modes: ~
 					  Visual    Select ~
 :vmap  :vnoremap  :vunmap  :vmapclear	    yes      yes
 :xmap  :xnoremap  :xunmap  :xmapclear	    yes       -
@@ -345,7 +333,7 @@ better to explicitly use :xmap and :smap for printable characters.  Or use
 			*mapmode-ic* *mapmode-i* *mapmode-c* *mapmode-l*
 Some commands work both in Insert mode and Command-line mode, some not:

-    COMMANDS				      MODES ~
+    commands:				      modes: ~
 					  Insert  Command-line	Lang-Arg ~
 :map!  :noremap!  :unmap!  :mapclear!	    yes	       yes	   -
 :imap  :inoremap  :iunmap  :imapclear	    yes		-	   -
@@ -392,7 +380,7 @@ it's just used here for this situation.
   The simplest way to load a set of related language mappings is by using the
 'keymap' option.  See |45.5|.
   In Insert mode and in Command-line mode the mappings can be disabled with
-the CTRL-^ command |i_CTRL-^| |c_CTRL-^|. These commands change the value of
+the CTRL-^ command |i_CTRL-^| |c_CTRL-^| These commands change the value of
 the 'iminsert' option.  When starting to enter a normal command line (not a
 search pattern) the mappings are disabled until a CTRL-^ is typed.  The state
 last used is remembered for Insert mode and Search patterns separately.  The
@@ -605,7 +593,7 @@ illogical when compared to other commands.
 When you have a mapping that contains an Ex command, you need to put a line
 terminator after it to have it executed.  The use of <CR> is recommended for
 this (see |<>|).  Example: >
-   :map  _ls  :!ls -l %:S<CR>:echo "the end"<CR>
+   :map  _ls  :!ls -l %<CR>:echo "the end"<CR>

 To avoid mapping of the characters you type in insert or Command-line mode,
 type a CTRL-V first.  The mapping in Insert mode is disabled if the 'paste'
@@ -828,10 +816,12 @@ Here is an example that counts the number of spaces with <F4>: >
 	  let &selection = "inclusive"
 	  let reg_save = @@

-	  if a:0  " Invoked from Visual mode, use gv command.
-	    silent exe "normal! gvy"
+	  if a:0  " Invoked from Visual mode, use '< and '> marks.
+	    silent exe "normal! `<" . a:type . "`>y"
 	  elseif a:type == 'line'
 	    silent exe "normal! '[V']y"
+	  elseif a:type == 'block'
+	    silent exe "normal! `[\<C-V>`]y"
 	  else
 	    silent exe "normal! `[v`]y"
 	  endif
@@ -923,11 +913,9 @@ Examples: ({CURSOR} is where you type a non-keyword character) >
 <		"test;;"	  is not expanded
 		"test ;;"	  is expanded to "test <endofline>"

-To avoid the abbreviation in Insert mode: Type CTRL-V before the character
-that would trigger the abbreviation.  E.g. CTRL-V <Space>.  Or type part of
-the abbreviation, exit insert mode with <Esc>, re-enter insert mode with "a"
-and type the rest.
-
+To avoid the abbreviation in insert mode: Type part of the abbreviation, exit
+insert mode with <Esc>, re-enter insert mode with "a" and type the rest.  Or
+type CTRL-V before the character after the abbreviation.
 To avoid the abbreviation in Command-line mode: Type CTRL-V twice somewhere in
 the abbreviation to avoid it to be replaced.  A CTRL-V in front of a normal
 character is mostly ignored otherwise.
@@ -1285,8 +1273,6 @@ completion can be enabled:
 	-complete=custom,{func} custom completion, defined via {func}
 	-complete=customlist,{func} custom completion, defined via {func}

-Note: That some completion methods might expand environment variables.
-

 Custom completion			*:command-completion-custom*
 					*:command-completion-customlist*
@@ -1358,19 +1344,6 @@ Possible attributes are:
 Note that -range=N and -count=N are mutually exclusive - only one should be
 specified.

-					*E889* *:command-addr*
-It is possible that the special characters in the range like ., $ or % which
-by default correspond to the current line, last line and the whole buffer,
-relate to arguments, (loaded) buffers, windows or tab pages.
-
-Possible values are:
-	-addr=lines		Range of lines (this is the default)
-	-addr=arguments		Range for arguments
-	-addr=buffers		Range for buffers (also not loaded buffers)
-	-addr=loaded_buffers	Range for loaded buffers
-	-addr=windows		Range for windows
-	-addr=tabs		Range for tab pages
-
 Special cases				*:command-bang* *:command-bar*
 					*:command-register* *:command-buffer*
 There are some special cases as well:
@@ -1386,8 +1359,6 @@ There are some special cases as well:
 In the cases of the -count and -register attributes, if the optional argument
 is supplied, it is removed from the argument list and is available to the
 replacement text separately.
-Note that these arguments can be abbreviated, but that is a deprecated
-feature.  Use the full name for new scripts.

 Replacement text

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.4.  Last change: 2015 Jun 06
+*motion.txt*    For Vim version 7.4.  Last change: 2013 Jul 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -172,8 +172,6 @@ CTRL-H		or					*CTRL-H* *<BS>*
 l		or					*l*
 <Right>		or					*<Right>* *<Space>*
 <Space>			[count] characters to the right.  |exclusive| motion.
-			See the 'whichwrap' option for adjusting the behavior
-			at end of line

 							*0*
 0			To the first character of the line.  |exclusive|
@@ -345,7 +343,7 @@ gg			Goto line [count], default first line, on the first
 			See also 'startofline' option.  {not in Vi}

 :[range]go[to] [count]					*:go* *:goto* *go*
-[count]go		Go to [count] byte in the buffer.  Default [count] is
+[count]go		Go to {count} byte in the buffer.  Default [count] is
 			one, start of the file.  When giving [range], the
 			last number in it used as the byte count.  End-of-line
 			characters are counted depending on the current
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.4.  Last change: 2015 Mar 14
+*netbeans.txt*  For Vim version 7.4.  Last change: 2012 Jan 26


 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -306,12 +306,7 @@ bufID		Buffer number.  A message may be either for a specific buffer
 		or generic.  Generic messages use a bufID of zero.  NOTE: this
 		buffer ID is assigned by the IDE, it is not Vim's buffer
 		number.  The bufID must be a sequentially rising number,
-		starting at one.  When the 'switchbuf' option is set to
-		"usetab" and the "bufID" buffer is not found in the current
-		tab page, the netbeans commands and functions that set this
-		buffer as the current buffer will jump to the first open
-		window that contains this buffer in other tab pages instead of
-		replacing the buffer in the current window.
+		starting at one.

 seqno		The IDE uses a sequence number for Commands and Functions.  A
 		Reply must use the sequence number of the Function that it is
@@ -475,7 +470,7 @@ raise		Bring the editor to the foreground.
 		New in version 2.1.

 removeAnno serNum
-		Remove a previously placed annotation for this buffer.
+		Remove a previously place annotation for this buffer.
 		"serNum" is the same number used in addAnno.

 save		Save the buffer when it was modified.  The other side of the
@@ -6,13 +6,9 @@

 					*mac* *Mac* *macintosh* *Macintosh*

-This file documents the particularities of the Mac version of Vim.  It was
-written with the older Carbon version of Vim in mind.  If you are using the
-newer MacVim.app then please go to |macvim|.  Some of the information here
-does not apply to MacVim.app.
+This file documents the particularities of the Macintosh version of Vim.

-NOTE: This file is a bit outdated.  You might find more useful info on the old
-Carbon version of Vim here:
+NOTE: This file is a bit outdated.  You might find more useful info here:
 	http://macvim.org/

 1. Filename Convention		|mac-filename|
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.4.  Last change: 2014 Aug 29
+*os_vms.txt*    For Vim version 7.4.  Last change: 2011 Aug 14


 		  VIM REFERENCE MANUAL
@@ -24,7 +24,7 @@ prompt.

 1. Getting started					*vms-started*

-Vim (Vi IMproved) is a Vi-compatible text editor that runs on nearly every
+Vim (Vi IMproved) is a vi-compatible text editor that runs on nearly every
 operating system known to humanity.  Now use Vim on OpenVMS too, in character
 or X/Motif environment.  It is fully featured and absolutely compatible with
 Vim on other operating systems.
@@ -764,22 +764,6 @@ GNU_TOOLS.ZIP package downloadable from http://www.polarhome.com/vim/

 9. VMS related changes					*vms-changes*

-Version 7.4 
- Undo: VMS can not handle more than one dot in the filenames use "dir/name" -> "dir/_un_name" 
-  add _un_ at the beginning to keep the extension
- correct swap file name wildcard handling
- handle iconv usage correctly
- do not optimize on vax - otherwise it hangs compiling crypto files
- fileio.c fix the comment
- correct RealWaitForChar 
- after 7.4-119 use different functions lib$cvtf_to_internal_time because Alpha and VAX have
-  G_FLOAT but IA64 uses IEEE float otherwise Vim crashes
- guard against crashes that are caused by mixed filenames
- [TESTDIR]make_vms.mms changed to see the output files
- Improve tests, update known issues
- minor compiler warnings fixed
- CTAGS 5.8 +regex included
-
 Version 7.3
 - CTAGS 5.8 included
 - VMS compile warnings fixed - floating-point overflow warning corrected on VAX
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.4.  Last change: 2014 Sep 25
+*os_win32.txt*  For Vim version 7.4.  Last change: 2012 May 18


 		  VIM REFERENCE MANUAL    by George Reilly
@@ -93,7 +93,7 @@ the default value of 'term' from the environment variable "TERM".
 $PATH							*win32-PATH*

 The directory of the Vim executable is appended to $PATH.  This is mostly to
-make "!xxd" work, as it is in the Tools menu.  And it also means that when
+make "!xxd' work, as it is in the Tools menu.  And it also means that when
 executable() returns 1 the executable can actually be executed.

 ==============================================================================
@@ -334,7 +334,7 @@ A. You have two possible solutions depending on what you want:
        :!start /min ctags -R .
 <  When it has finished you should see file named "tags" in your current
   directory.  You should notice the window title blinking on your taskbar.
-   This is more noticeable for commands that take longer.
+   This is more noticable for commands that take longer.
   Now delete the "tags" file and run this command: >
        :!start /b ctags -R .
 <  You should have the same "tags" file, but this time there will be no
@@ -367,10 +367,4 @@ Q. I use Vim under Win32s and NT.  In NT, I can define the console to default to
 A. Edit SYSTEM.INI and add 'ScreenLines=50' to the [NonWindowsApp] section.  DOS
   prompts and external DOS commands will now run in a 50-line window.

-						*windows-icon*
-Q. I don't like the Vim icon, can I change it?
-A. Yes, place your favorite icon in bitmaps/vim.ico in a directory of
-   'runtimepath'.  For example ~/vimfiles/bitmaps/vim.ico.
-
-
 vim:tw=78:fo=tcq2:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.4.  Last change: 2015 Mar 16
+*pattern.txt*   For Vim version 7.4.  Last change: 2013 Jul 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -59,8 +59,6 @@ explanations are in chapter 27 |usr_27.txt|.

 							*n*
 n			Repeat the latest "/" or "?" [count] times.
-			If the cursor doesn't move the search is repeated with
-			count + 1.
 			|last-pattern| {Vi: no count}

 							*N*
@@ -194,10 +192,10 @@ affected.
 An example of how to search for matches with a pattern and change the match
 with another word: >
 	/foo<CR>	find "foo"
-	c//e<CR>	change until end of match
+	c//e		change until end of match
 	bar<Esc>	type replacement
 	//<CR>		go to start of next match
-	c//e<CR>	change until end of match
+	c//e		change until end of match
 	beep<Esc>	type another replacement
 			etc.
 <
@@ -547,7 +545,6 @@ Character classes {not in Vi}:				*/character-classes*
 |/\%u|	\%u	\%u	match specified multibyte character (eg \%u20ac)
 |/\%U|	\%U	\%U	match specified large multibyte character (eg
 			\%U12345678)
-|/\%C|	\%C	\%C	match any composing characters

 Example			matches ~
 \<\I\i*		or
@@ -708,18 +705,11 @@ overview.
 	But to limit the time needed, only the line where what follows matches
 	is searched, and one line before that (if there is one).  This should
 	be sufficient to match most things and not be too slow.
-
-	In the old regexp engine the part of the pattern after "\@<=" and
-	"\@<!" are checked for a match first, thus things like "\1" don't work
-	to reference \(\) inside the preceding atom.  It does work the other
-	way around:
-	Bad example			matches ~
-	\%#=1\1\@<=,\([a-z]\+\)		",abc" in "abc,abc"
-
-	However, the new regexp engine works differently, it is better to not
-	rely on this behavior, do not use \@<= if it can be avoided:
-	Example				matches ~
-	\([a-z]\+\)\zs,\1		",abc" in "abc,abc"
+	The part of the pattern after "\@<=" and "\@<!" are checked for a
+	match first, thus things like "\1" don't work to reference \(\) inside
+	the preceding atom.  It does work the other way around:
+	Example			matches ~
+	\1\@<=,\([a-z]\+\)	",abc" in "abc,abc"

 \@123<=
 	Like "\@<=" but only look back 123 bytes. This avoids trying lots
@@ -831,7 +821,6 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	branch is used.  Example: >
 		/\(.\{-}\zsFab\)\{3}
 <	Finds the third occurrence of "Fab".
-	This cannot be followed by a multi. *E888*
 	{not in Vi} {not available when compiled without the |+syntax| feature}
 							*/\ze*
 \ze	Matches at any position, and sets the end of the match there: The
@@ -840,7 +829,6 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	branch is used.
 	Example: "end\ze\(if\|for\)" matches the "end" in "endif" and
 	"endfor".
-	This cannot be followed by a multi. |E888|
 	{not in Vi} {not available when compiled without the |+syntax| feature}

 						*/\%^* *start-of-file*
@@ -1060,10 +1048,7 @@ x	A single character, with no special meaning, matches itself
 								*E769*
 	When the ']' is not there Vim will not give an error message but
 	assume no collection is used.  Useful to search for '['.  However, you
-	do get E769 for internal searching.  And be aware that in a
-	`:substitute` command the whole command becomes the pattern.  E.g.
-	":s/[/x/" searches for "[/x" and replaces it with nothing.  It does
-	not search for "[" and replaces it with "x"!
+	do get E769 for internal searching.

 	If the sequence begins with "^", it matches any single character NOT
 	in the collection: "[^xyz]" matches anything but 'x', 'y' and 'z'.
@@ -1222,18 +1207,12 @@ will probably never match.
 8. Composing characters					*patterns-composing*

 							*/\Z*
-When "\Z" appears anywhere in the pattern, all composing characters are
-ignored.  Thus only the base characters need to match, the composing
-characters may be different and the number of composing characters may differ.
-Only relevant when 'encoding' is "utf-8".
+When "\Z" appears anywhere in the pattern, composing characters are ignored.
+Thus only the base characters need to match, the composing characters may be
+different and the number of composing characters may differ.  Only relevant
+when 'encoding' is "utf-8".
 Exception: If the pattern starts with one or more composing characters, these
 must match.
-							*/\%C*
-Use "\%C" to skip any composing characters.  For example, the pattern "a" does
-not match in "càt" (where the a has the composing character 0x0300), but
-"a\%C" does.  Note that this does not match "cát" (where the á is character
-0xe1, it does not have a compositing character).  It does match "cat" (where
-the a is just an a).

 When a composing character appears at the start of the pattern of after an
 item that doesn't include the composing character, a match is found at any
@@ -1346,7 +1325,7 @@ Finally, these constructs are unique to Perl:
 		patterns defined by both |matchadd()| and |:match|.

 		Highlighting matches using |:match| are limited to three
-		matches (aside from |:match|, |:2match| and |:3match| are
+		matches (aside from |:match|, |:2match| and |:3match|are
 		available). |matchadd()| does not have this limitation and in
 		addition makes it possible to prioritize matches.

@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 7.0.  Last change: 2013 Nov 29
+*pi_getscript.txt*  For Vim version 7.4.  Last change: 2012 Apr 07
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
@@ -385,10 +385,6 @@ The AutoInstall process will:
 ==============================================================================
 9. GetLatestVimScripts History		*getscript-history* *glvs-hist* {{{1

-v36 Apr 22, 2013 : * (glts) suggested use of plugin/**/*.vim instead of
-		     plugin/*.vim in globpath() call.
-		   * (Andy Wokula) got warning message when setting
-		     g:loaded_getscriptPlugin
 v35 Apr 07, 2012 : * (MengHuan Yu) pointed out that the script url has
 		     changed (somewhat).  However, it doesn't work, and
 		     the original one does (under Linux). I'll make it
@@ -1,117 +0,0 @@
-*pi_logipat.txt*	Logical Patterns				Mar 13, 2013
-
-Author:  Charles E. Campbell  <NdrOchip@ScampbellPfamily.AbizM>
-Copyright: (c) 2004-2013 by Charles E. Campbell	*logipat-copyright*
-           The VIM LICENSE applies to LogiPat.vim and LogiPat.txt
-           (see |copyright|) except use "LogiPat" instead of "Vim"
-	   No warranty, express or implied.  Use At-Your-Own-Risk.
-
-==============================================================================
-1. Contents					*logipat* *logipat-contents*
-
-	1. Contents.................: |logipat-contents|
-	2. LogiPat Manual...........: |logipat-manual|
-	3. LogiPat Examples.........: |logipat-examples|
-	4. Caveat...................: |logipat-caveat|
-	5. LogiPat History..........: |logipat-history|
-
-==============================================================================
-2. LogiPat Manual			*logipat-manual* *logipat-man*
-
-
-	*logipat-arg* *logipat-input* *logipat-pattern* *logipat-operators*
-	Boolean logic patterns are composed of
-
-			operators  ! = not
-			           | = logical-or
-			           & = logical-and
-			grouping   ( ... )
-			patterns   "pattern"
-
-	:LogiPat {boolean-logic pattern}		*:LogiPat*
-		:LogiPat is a command which takes a boolean-logic
-		argument (|logipat-arg|).
-
-	:LP {boolean-logic pattern}			*:LP*
-		:LP is a shorthand command version of :LogiPat
-		(|:LogiPat|).
-
-	:ELP {boolean-logic pattern}			*:ELP*
-		No search is done, but the conversion from the
-		boolean logic pattern to the regular expression
-		is performed and echoed onto the display.
-
-	:LogiPatFlags {search flags}			*LogiPat-flags*
-		:LogiPatFlags {search flags}
-		LogiPat uses the |search()| command.  The flags
-		passed to that call to search() may be specified
-		by the :LogiPatFlags command.
-
-	:LPF {search flags}				*:LPF*
-		:LPF is a shorthand version of :LogiPatFlags.
-
-	:let pat=LogiPat({boolean-logic pattern})	*LogiPat()*
-		If one calls LogiPat() directly, no search
-		is done, but the transformation from the boolean
-		logic pattern into a regular expression pattern
-		is performed and returned.
-
-	To get a " inside a pattern, as opposed to having it delimit
-	the pattern, double it.
-
-==============================================================================
-3. LogiPat Examples					*logipat-examples*
-
-	LogiPat takes Boolean logic arguments and produces a regular
-	expression which implements the choices.  A series of examples
-	follows:
->
-	:LogiPat "abc"
-<		will search for lines containing the string  :abc:
->
-	:LogiPat "ab""cd"
-<		will search for lines containing the string  :ab"c:
->
-	:LogiPat !"abc"
-<		will search for lines which don't contain the string  :abc:
->
-	:LogiPat "abc"|"def"
-<		will search for lines which contain either the string
-		:abc:  or the string  :def:
->
-	:LogiPat !("abc"|"def")
-<		will search for lines which don't contain either
-		of the strings  :abc:  or  :def:
->
-	:LogiPat "abc"&"def"
-<		will search for lines which contain both of the strings
-		:abc:  and  :def:
->
-	:let pat= LogiPat('!"abc"')
-<		will return the regular expression which will match
-		all lines not containing  :abc: .  The double quotes
-		are needed to pass normal patterns to LogiPat, and
-		differentiate such patterns from boolean logic
-		operators.
-
-
-==============================================================================
-4. Caveat						*logipat-caveat*
-
-	The "not" operator may be fragile; ie. it may not always play well
-	with the & (logical-and) and | (logical-or) operators.  Please try out
-	your patterns, possibly with :set hls, to insure that what is matching
-	is what you want.
-
-==============================================================================
-3. LogiPat History					*logipat-history*
-
-	v3 Sep 25, 2006 * LP_Or() fixed; it now encapsulates its output
-	                  in \%(...\) parentheses
-	   Dec 12, 2011 * |:ELP| added
-			* "" is mapped to a single " and left inside patterns
-	v2 May 31, 2005	* LPF and LogiPatFlags commands weren't working
-	v1 May 23, 2005	* initial release
-
-==============================================================================
-vim:tw=78:ts=8:ft=help
@@ -188,7 +188,7 @@ WINDOWS							*vimball-windows*
 			  * Changed silent! to sil! (shorter)
 			  * Safed |'swf'| setting (during vimball extraction,
 			    its now turned off)
-	32 : May 19, 2010 * (Christian Brabandt) :so someplugin.vba and
+	32 : May 19, 2010 * (Christian Brabrandt) :so someplugin.vba and
 			    :so someplugin.vba.gz (and the other supported
 			    compression types) now works
 			  * (Jan Steffens) added support for xz compression
@@ -693,7 +693,7 @@ It is possible to achieve a poor man's version of duplex printing using the PS
 utility psselect.  This utility has options -e and -o for printing just the
 even or odd pages of a PS file respectively.

-First generate a PS file with the 'hardcopy' command, then generate new
+First generate a PS file with the 'hardcopy' command, then generate a new
 files with all the odd and even numbered pages with: >

 	psselect -o test.ps odd.ps
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.4.  Last change: 2015 Sep 08
+*quickfix.txt*  For Vim version 7.4.  Last change: 2013 Aug 03


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -202,8 +202,8 @@ command with 'l'.
 			the current window is used instead of the quickfix
 			list.

-							*:cad* *:caddbuffer*
-:cad[dbuffer] [bufnr]	Read the error list from the current buffer and add
+							*:caddb* *:caddbuffer*
+:caddb[uffer] [bufnr]	Read the error list from the current buffer and add
 			the errors to the current quickfix list.  If a
 			quickfix list is not present, then a new list is
 			created. Otherwise, same as ":cbuffer".
@@ -240,8 +240,8 @@ command with 'l'.
 :lgete[xpr] {expr}	Same as |:cgetexpr|, except the location list for the
 			current window is used instead of the quickfix list.

-							*:cadde* *:caddexpr*
-:cadde[xpr] {expr}	Evaluate {expr} and add the resulting lines to the
+							*:cad* *:caddexpr*
+:cad[dexpr] {expr}	Evaluate {expr} and add the resulting lines to the
 			current quickfix list. If a quickfix list is not
 			present, then a new list is created. The current
 			cursor position will not be changed. See |:cexpr| for
@@ -299,97 +299,23 @@ use this code: >
 	au QuickfixCmdPost make call QfMakeConv()


-EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST:
-							*:cdo*
-:cdo[!] {cmd}		Execute {cmd} in each valid entry in the quickfix list.
-			It works like doing this: >
-				:cfirst
-				:{cmd}
-				:cnext
-				:{cmd}
-				etc.
-<			When the current file can't be |abandon|ed and the [!]
-			is not present, the command fails.
-			When an error is detected excecution stops.
-			The last buffer (or where an error occurred) becomes
-			the current buffer.
-			{cmd} can contain '|' to concatenate several commands.
-
-			Only valid entries in the quickfix list are used.
-			A range can be used to select entries, e.g.: >
-				:10,$cdo cmd
-<			To skip entries 1 to 9.
-
-			Note: While this command is executing, the Syntax
-			autocommand event is disabled by adding it to
-			'eventignore'.  This considerably speeds up editing
-			each buffer.
-			{not in Vi} {not available when compiled without the
-			|+listcmds| feature}
-			Also see |:bufdo|, |:tabdo|, |:argdo|, |:windo|,
-			|:ldo|, |:cfdo| and |:lfdo|.
-
-							*:cfdo*
-:cfdo[!] {cmd}		Execute {cmd} in each file in the quickfix list.
-			It works like doing this: >
-				:cfirst
-				:{cmd}
-				:cnfile
-				:{cmd}
-				etc.
-<			Otherwise it works the same as `:cdo`.
-			{not in Vi} {not available when compiled without the
-			|+listcmds| feature}
-
-							*:ldo*
-:ld[o][!] {cmd}		Execute {cmd} in each valid entry in the location list
-			for the current window.
-			It works like doing this: >
-				:lfirst
-				:{cmd}
-				:lnext
-				:{cmd}
-				etc.
-<			Only valid entries in the location list are used.
-			Otherwise it works the same as `:cdo`.
-			{not in Vi} {not available when compiled without the
-			|+listcmds| feature}
-
-							*:lfdo*
-:lfdo[!] {cmd}		Execute {cmd} in each file in the location list for
-			the current window.
-			It works like doing this: >
-				:lfirst
-				:{cmd}
-				:lnfile
-				:{cmd}
-				etc.
-<			Otherwise it works the same as `:ldo`.
-			{not in Vi} {not available when compiled without the
-			|+listcmds| feature}
-
 =============================================================================
 2. The error window					*quickfix-window*

 					    *:cope* *:copen* *w:quickfix_title*
 :cope[n] [height]	Open a window to show the current list of errors.
-
 			When [height] is given, the window becomes that high
-			(if there is room).  When [height] is omitted the
-			window is made ten lines high.
-
-			If there already is a quickfix window, it will be made
-			the current window.  It is not possible to open a
-			second quickfix window.  If [height] is given the
-			existing window will be resized to it.
-
+			(if there is room).  Otherwise the window is made ten
+			lines high.
 			The window will contain a special buffer, with
 			'buftype' equal to "quickfix".  Don't change this!
-			The window will have the w:quickfix_title variable set
-			which will indicate the command that produced the
-			quickfix list. This can be used to compose a custom
-			status line if the value of 'statusline' is adjusted
-			properly.
+			If there already is a quickfix window, it will be made
+			the current window.  It is not possible to open a
+			second quickfix window. The window will have the
+			w:quickfix_title variable set which will indicate the
+			command that produced the quickfix list. This can be
+			used to compose a custom status line if the value of
+			'statusline' is adjusted properly.

 							*:lop* *:lopen*
 :lop[en] [height]	Open a window to show the location list for the
@@ -912,7 +838,7 @@ Unfortunately, there is no standard way to run the tests.
 The alltests.py script seems to be used quite often, that's all.
 Useful values for the 'makeprg' options therefore are:
 setlocal makeprg=./alltests.py " Run a testsuite
- setlocal makeprg=python\ %:S   " Run a single testcase
+ setlocal makeprg=python %      " Run a single testcase

 Also see http://vim.sourceforge.net/tip_view.php?tip_id=280.

@@ -1406,7 +1332,7 @@ or: >
 Here is an alternative from Michael F. Lamb for Unix that filters the errors
 first: >
  :setl errorformat=%Z%f:%l:\ %m,%A%p^,%-G%*[^sl]%.%#
-  :setl makeprg=javac\ %:S\ 2>&1\ \\\|\ vim-javac-filter
+  :setl makeprg=javac\ %\ 2>&1\ \\\|\ vim-javac-filter

 You need to put the following in "vim-javac-filter" somewhere in your path
 (e.g., in ~/bin) and make it executable: >
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.4.  Last change: 2015 Nov 10
+*quickref.txt*  For Vim version 7.4.  Last change: 2013 Jun 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -620,14 +620,10 @@ Short explanation of each option:		*option-list*
 'balloondelay'	  'bdlay'   delay in mS before a balloon may pop up
 'ballooneval'	  'beval'   switch on balloon evaluation
 'balloonexpr'	  'bexpr'   expression to show in balloon
-'belloff'	  'bo'	    do not ring the bell for these reasons
 'binary'	  'bin'     read/write/edit file in binary mode
 'bioskey'	  'biosk'   MS-DOS: use bios calls for input characters
-'blurradius'	  'blur'    transparency blur of the GUI window (MacVim only)
 'bomb'			    prepend a Byte Order Mark to the file
 'breakat'	  'brk'     characters that may cause a line break
-'breakindent'	  'bri'     wrapped line repeats indent 
-'breakindentopt'  'briopt'  settings for 'breakindent'
 'browsedir'	  'bsdir'   which directory to start browsing in
 'bufhidden'	  'bh'	    what to do when buffer is no longer in window
 'buflisted'	  'bl'	    whether the buffer shows up in the buffer list
@@ -698,7 +694,6 @@ Short explanation of each option:		*option-list*
 'fileignorecase'  'fic'     ignore case when using file names
 'filetype'	  'ft'	    type of file, used for autocommands
 'fillchars'	  'fcs'     characters to use for displaying special items
-'fixendofline'	  'fixeol'  make sure last line in file has <EOL>
 'fkmap'		  'fk'	    Farsi keyboard mapping
 'foldclose'	  'fcl'     close a fold when the cursor leaves it
 'foldcolumn'	  'fdc'     width of the column used to indicate folds
@@ -713,13 +708,11 @@ Short explanation of each option:		*option-list*
 'foldnestmax'	  'fdn'     maximum fold depth
 'foldopen'	  'fdo'     for which commands a fold will be opened
 'foldtext'	  'fdt'     expression used to display for a closed fold
-'formatexpr'	  'fex'     expression used with "gq" command
 'formatlistpat'   'flp'     pattern used to recognize a list header
 'formatoptions'   'fo'	    how automatic formatting is to be done
 'formatprg'	  'fp'	    name of external program used with "gq" command
+'formatexpr'	  'fex'     expression used with "gq" command
 'fsync'		  'fs'	    whether to invoke fsync() after file write
-'fullscreen'	  'fu'	    let vim cover the whole screen (MacVim only)
-'fuoptions'	  'fuopt'   controls how 'fullscreen' behaves (MacVim only)
 'gdefault'	  'gd'	    the ":substitute" flag 'g' is default on
 'grepformat'	  'gfm'     format of 'grepprg' output
 'grepprg'	  'gp'	    program to use for ":grep"
@@ -737,15 +730,15 @@ Short explanation of each option:		*option-list*
 'helplang'	  'hlg'     preferred help languages
 'hidden'	  'hid'     don't unload buffer when it is |abandon|ed
 'highlight'	  'hl'	    sets highlighting mode for various occasions
+'hlsearch'	  'hls'     highlight matches with last search pattern
 'history'	  'hi'	    number of command-lines that are remembered
 'hkmap'		  'hk'	    Hebrew keyboard mapping
 'hkmapp'	  'hkp'     phonetic Hebrew keyboard mapping
-'hlsearch'	  'hls'     highlight matches with last search pattern
 'icon'			    let Vim set the text of the window icon
 'iconstring'		    string to use for the Vim icon text
 'ignorecase'	  'ic'	    ignore case in search patterns
-'imactivatefunc'  'imaf'    function to enable/disable the X input method
 'imactivatekey'   'imak'    key that activates the X input method
+'imactivatefunc'  'imaf'    function to enable/disable the X input method
 'imcmdline'	  'imc'     use IM when starting to edit a command line
 'imdisable'	  'imd'     do not use the IM in any mode
 'iminsert'	  'imi'     use :lmap or IM in Insert mode
@@ -769,7 +762,6 @@ Short explanation of each option:		*option-list*
 'keywordprg'	  'kp'	    program to use for the "K" command
 'langmap'	  'lmap'    alphabetic characters for other language mode
 'langmenu'	  'lm'	    language to be used for the menus
-'langnoremap'	  'lnr'	    do not apply 'langmap' to mapped characters
 'laststatus'	  'ls'	    tells when last window has status lines
 'lazyredraw'	  'lz'	    don't redraw while executing macros
 'linebreak'	  'lbr'     wrap long lines at a blank
@@ -780,10 +772,7 @@ Short explanation of each option:		*option-list*
 'list'			    show <Tab> and <EOL>
 'listchars'	  'lcs'     characters for displaying in list mode
 'loadplugins'	  'lpl'     load plugin scripts when starting up
-'luadll'		    name of the Lua dynamic library
 'macatsui'		    Mac GUI: use ATSUI text drawing
-'macligatures'		    display ligatures (MacVim GUI only)
-'macmeta'	  'mmta'    use option as meta key (MacVim GUI only)
 'magic'			    changes special characters in search patterns
 'makeef'	  'mef'     name of the errorfile for ":make"
 'makeprg'	  'mp'	    program to use for the ":make" command
@@ -822,7 +811,6 @@ Short explanation of each option:		*option-list*
 'patchexpr'	  'pex'     expression used to patch a file
 'patchmode'	  'pm'	    keep the oldest version of a file
 'path'		  'pa'	    list of directories searched with "gf" et.al.
-'perldll'		    name of the Perl dynamic library
 'preserveindent'  'pi'	    preserve the indent structure when reindenting
 'previewheight'   'pvh'     height of the preview window
 'previewwindow'   'pvw'     identifies the preview window
@@ -835,21 +823,17 @@ Short explanation of each option:		*option-list*
 'printmbfont'	  'pmbfn'   font names to be used for CJK output of :hardcopy
 'printoptions'	  'popt'    controls the format of :hardcopy output
 'pumheight'	  'ph'	    maximum height of the popup menu
-'pythondll'		    name of the Python 2 dynamic library
-'pythonthreedll'	    name of the Python 3 dynamic library
 'quoteescape'	  'qe'	    escape characters used in a string
 'readonly'	  'ro'	    disallow writing the buffer
 'redrawtime'	  'rdt'     timeout for 'hlsearch' and |:match| highlighting
 'regexpengine'	  're'	    default regexp engine to use
 'relativenumber'  'rnu'	    show relative line number in front of each line
 'remap'			    allow mappings to work recursively
-'renderoptions'	  'rop'	    options for text rendering on Windows
 'report'		    threshold for reporting nr. of lines changed
 'restorescreen'   'rs'	    Win32: restore screen when exiting
 'revins'	  'ri'	    inserting characters will work backwards
 'rightleft'	  'rl'	    window is right-to-left oriented
 'rightleftcmd'	  'rlc'     commands for which editing works right-to-left
-'rubydll'		    name of the Ruby dynamic library
 'ruler'		  'ru'	    show cursor line and column in the status line
 'rulerformat'	  'ruf'     custom format for the ruler
 'runtimepath'	  'rtp'     list of directories used for runtime files
@@ -905,9 +889,9 @@ Short explanation of each option:		*option-list*
 'switchbuf'	  'swb'     sets behavior when switching to another buffer
 'synmaxcol'	  'smc'     maximum column to find syntax items
 'syntax'	  'syn'     syntax to be loaded for current buffer
+'tabstop'	  'ts'	    number of spaces that <Tab> in file uses
 'tabline'	  'tal'     custom format for the console tab pages line
 'tabpagemax'	  'tpm'     maximum number of tab pages for |-p| and "tab all"
-'tabstop'	  'ts'	    number of spaces that <Tab> in file uses
 'tagbsearch'	  'tbs'     use binary searching in tags files
 'taglength'	  'tl'	    number of significant characters for a tag
 'tagrelative'	  'tr'	    file names in tag file are relative
@@ -929,8 +913,7 @@ Short explanation of each option:		*option-list*
 'titleold'		    old title, restored when exiting
 'titlestring'		    string to use for the Vim window title
 'toolbar'	  'tb'	    GUI: which items to show in the toolbar
-'toolbariconsize' 'tbis'    size of the toolbar icons (MacVim and GTK 2 only)
-'transparency'    'transp'  transparency of the GUI window (MacVim only)
+'toolbariconsize' 'tbis'    size of the toolbar icons (for GTK 2 only)
 'ttimeout'		    time out on mappings
 'ttimeoutlen'	  'ttm'     time out time for key codes in milliseconds
 'ttybuiltin'	  'tbi'     use built-in termcap before external termcap
@@ -1327,16 +1310,11 @@ Context-sensitive completion on the command-line:
 |CTRL-W_R|	CTRL-W R		rotate windows upwards
 |CTRL-W_x|	CTRL-W x		exchange current window with next one

-|CTRL-W_=|	CTRL-W =		make all windows equal height & width
+|CTRL-W_=|	CTRL-W =		make all windows equal height
 |CTRL-W_-|	CTRL-W -		decrease current window height
 |CTRL-W_+|	CTRL-W +		increase current window height
 |CTRL-W__|	CTRL-W _		set current window height (default:
 					   very high)
-
-|CTRL-W_<|	CTRL-W <		decrease current window width
-|CTRL-W_>|	CTRL-W >		increase current window width
-|CTRL-W_bar|	CTRL-W |		set current window width (default:
-					   widest possible)
 ------------------------------------------------------------------------------
 *Q_bu*		Buffer list commands

@@ -178,14 +178,14 @@ Hurrah for VIM!! It is "at your fingertips" like vi, and has the extensions
 that vi sorely needs: highlighting for executing commands on blocks, an easily
 navigable and digestible help screen, and more.  (Paul Pax)

-The reason WHY I don't have this amazingly useful macro anymore, is that I
+The reason WHY I don't have this amazingly useful macro any more, is that I
 now use VIM - and this is built in!! (Stephen Riehm, Germany)

 I am a user of VIM and I love it.  I use it to do all my programming, C,
 C++, HTML what ever.  (Tim Allwine)

 I discovered VIM after years of struggling with the original vi, and I just
-can't live without it anymore.  (Emmanuel Mogenet, USA)
+can't live without it any more.  (Emmanuel Mogenet, USA)

 Emacs has not a bit of chance to survive so long as VIM is around.  Besides,
 it also has the most detailed software documentation I have ever seen---much
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 7.4.  Last change: 2014 Mar 27
+*recover.txt*   For Vim version 7.4.  Last change: 2010 Jul 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -81,14 +81,7 @@ the amount of memory used to be higher than given with 'maxmem' or
 'maxmemtot'.  And when making a change to a read-only file, the swap file is
 created anyway.

-The 'swapfile' option can be reset to avoid creating a swapfile.  And the
-|:noswapfile| modifier can be used to not create a swapfile for a new buffer.
-
-:nos[wapfile]   {command}			*:nos* *:noswapfile*
-		Execute {command}. If it contains a command that loads a new
-		buffer, it will be loaded without creating a swapfile and the
-		'swapfile' option will be reset.  If a buffer already had a
-		swapfile it is not removed and 'swapfile' is not reset.
+The 'swapfile' option can be reset to avoid creating a swapfile.


 Detecting an existing swap file ~
@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 7.4.  Last change: 2015 Mar 01
+*remote.txt*    For Vim version 7.4.  Last change: 2008 May 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -9,7 +9,6 @@ Vim client-server communication				*client-server*
 1. Common functionality		|clientserver|
 2. X11 specific items		|x11-clientserver|
 3. MS-Windows specific items	|w32-clientserver|
-4. MacVim specific items	|macvim-clientserver|

 {Vi does not have any of these commands}

@@ -37,8 +36,7 @@ The following command line arguments are available:
 				The remote Vim is raised.  If you don't want
 				this use >
 				 vim --remote-send "<C-\><C-N>:n filename<CR>"
-<
-   --remote-silent [+{cmd}] {file} ...			*--remote-silent*
+<  --remote-silent [+{cmd}] {file} ...			*--remote-silent*
 				As above, but don't complain if there is no
 				server and the file is edited locally.
   --remote-wait [+{cmd}] {file} ...				*--remote-wait*
@@ -203,23 +201,4 @@ When using gvim, the --remote-wait only works properly this way: >

 	start /w gvim --remote-wait file.txt
 <
-==============================================================================
-4. MacVim specific items				*macvim-clientserver*
-
-MacVim uses distributed objects for interprocess communication.  A server
-listens to a named port for new connections, and clients connect to this port
-to send messages.  Server listings are made possible by the frontend (MacVim)
-keeping a list of all currently running servers.  Thus, servers are not aware
-of each other directly; only MacVim knows which servers are running.
-
-A client is any object which implements the MMVimClientProtocol (see
-MacVim.h).  Take a look at MMBackend if you wish to implement this protocol in
-your own application.  The current implementation assumes that the
-NSConnections use mach ports for interprocess communication.  This means that
-you can only use Vim's client/server feature on a local machine (and not
-across a network).
-
-Note: Client mode always works, but server mode only works when the GUI is
-started.
-
 vim:tw=78:sw=4:ts=8:ft=help:norl:
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.4.  Last change: 2015 Apr 13
+*repeat.txt*    For Vim version 7.4.  Last change: 2013 Jul 25


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -26,14 +26,10 @@ Chapter 26 of the user manual introduces repeating |usr_26.txt|.

 Simple changes can be repeated with the "." command.  Without a count, the
 count of the last change is used.  If you enter a count, it will replace the
-last one.  |v:count| and |v:count1| will be set.
-
-If the last change included a specification of a numbered register, the
-register number will be incremented.  See |redo-register| for an example how
-to use this.
-
-Note that when repeating a command that used a Visual selection, the same SIZE
-of area is used, see |visual-repeat|.
+last one.  If the last change included a specification of a numbered register,
+the register number will be incremented.  See |redo-register| for an example
+how to use this.  Note that when repeating a command that used a Visual
+selection, the same SIZE of area is used, see |visual-repeat|.

 							*@:*
@:			Repeat last command-line [count] times.
@@ -64,9 +60,6 @@ replacement string.

 For the definition of a pattern, see |pattern|.

-NOTE [cmd] may contain a range; see |collapse| and |edit-paragraph-join| for
-examples.
-
 The global commands work by first scanning through the [range] lines and
 marking each line where a match occurs (for a multi-line pattern, only the
 start of the match matters).
@@ -109,13 +102,7 @@ To abort this type CTRL-C twice.
 q{0-9a-zA-Z"}		Record typed characters into register {0-9a-zA-Z"}
 			(uppercase to append).  The 'q' command is disabled
 			while executing a register, and it doesn't work inside
-			a mapping and |:normal|.
-
-			Note: If the register being used for recording is also
-			used for |y| and |p| the result is most likely not
-			what is expected, because the put will paste the
-			recorded macro and the yank will overwrite the
-			recorded macro. {Vi: no recording}
+			a mapping and |:normal|.  {Vi: no recording}

 q			Stops recording.  (Implementation note: The 'q' that
 			stops recording is not stored in the register, unless
@@ -241,8 +228,8 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			command is ignored.
 			{not in Vi}

-						*:scr* *:scriptnames*
-:scr[iptnames]		List all sourced script names, in the order they were
+						*:scrip* *:scriptnames*
+:scrip[tnames]		List all sourced script names, in the order they were
 			first sourced.  The number is used for the script ID
 			|<SID>|.
 			{not in Vi} {not available when compiled without the
@@ -597,16 +584,9 @@ the |+reltime| feature, which is present more often.

 For profiling syntax highlighting see |:syntime|.

-For example, to profile the one_script.vim script file: >
-	:profile start /tmp/one_script_profile
-	:profile file one_script.vim
-	:source one_script.vim
-	:exit
-

 :prof[ile] start {fname}			*:prof* *:profile* *E750*
 		Start profiling, write the output in {fname} upon exit.
-		"~/" and environment variables in {fname} will be expanded.
 		If {fname} already exists it will be silently overwritten.
 		The variable |v:profiling| is set to one.

@@ -628,10 +608,8 @@ For example, to profile the one_script.vim script file: >
 		This only profiles the script itself, not the functions
 		defined in it.
 		When the [!] is added then all functions defined in the script
-		will also be profiled.
-		Note that profiling only starts when the script is loaded
-		after this command.  A :profile command in the script itself
-		won't work.
+		will also be profiled.  But only if the script is loaded after
+		this command.


 :profd[el] ...						*:profd* *:profdel*
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 7.4.  Last change: 2014 May 07
+*sign.txt*      For Vim version 7.4.  Last change: 2012 Jul 10


 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -137,7 +137,6 @@ PLACING SIGNS						*:sign-place* *E158*
 :sign place {id} line={lnum} name={name} buffer={nr}
 		Same, but use buffer {nr}.

-							*E885*
 :sign place {id} name={name} file={fname}
 		Change the placed sign {id} in file {fname} to use the defined
 		sign {name}.  See remark above about {fname} |:sign-fname|.
@@ -174,7 +173,7 @@ REMOVING SIGNS						*:sign-unplace* *E159*
 		Remove the placed sign at the cursor position.


-LISTING PLACED SIGNS					*:sign-place-list*
+LISTING PLACED SIGNS

 :sign place file={fname}
 		List signs placed in file {fname}.
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.4.  Last change: 2014 Sep 19
+*spell.txt*	For Vim version 7.4.  Last change: 2013 Jul 17


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -269,13 +269,6 @@ In a table:
 	latin1		yi		transliterated Yiddish
 	utf-8		yi-tr		transliterated Yiddish

-							*spell-cjk*
-Chinese, Japanese and other East Asian characters are normally marked as
-errors, because spell checking of these characters is not supported. If
-'spelllang' includes "cjk", these characters are not marked as errors.  This
-is useful when editing text with spell checking while some Asian words are
-present.
-

 SPELL FILES						*spell-load*

@@ -939,10 +932,9 @@ be combined without errors.

 If you get an E763 warning that the word tables differ you need to update your
 ".spl" spell files.  If you downloaded the files, get the latest version of
-all spell files you use.  If you are only using one, e.g., German, then also
-download the recent English spell files.  Otherwise generate the .spl file
-again with |:mkspell|.  If you still get errors check the FOL, LOW and UPP
-lines in the used .aff files.
+all spell files you use.  Otherwise generate the .spl file again with
+|:mkspell|.  If you still get errors check the FOL, LOW and UPP lines in the
+used .aff files.

 The XX.ascii.spl spell file generated with the "-ascii" argument will not
 contain the table with characters, so that it can be combine with spell files
@@ -1058,9 +1050,6 @@ this text to start with a "#" so that mistakes don't go unnoticed.  Example:
 	SFX F 0 in   [^i]n      # Spion > Spionin  ~
 	SFX F 0 nen  in		# Bauerin > Bauerinnen ~

-However, to avoid lots of errors in affix files written for Myspell, you can
-add the IGNOREEXTRA flag.
-
 Apparently Myspell allows an affix name to appear more than once.  Since this
 might also be a mistake, Vim checks for an extra "S".  The affix files for
 Myspell that use this feature apparently have this flag.  Example:
@@ -1114,14 +1103,6 @@ Specifically, the affix flags can be used for:
 - CIRCUMFIX, as explained just below.


-IGNOREEXTRA						*spell-IGNOREEXTRA*
-
-Normally Vim gives an error for an extra field that does not start with '#'.
-This avoids errors going unnoticed.  However, some files created for Myspell
-or Hunspell may contain many entries with an extra field.  Use the IGNOREEXTRA
-flag to avoid lots of errors.
-
-
 CIRCUMFIX						*spell-CIRCUMFIX*

 The CIRCUMFIX flag means a prefix and suffix must be added at the same time.
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.4.  Last change: 2014 Jul 09
+*starting.txt*  For Vim version 7.4.  Last change: 2013 Jul 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -167,10 +167,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 							*-+/*
 +/{pat}		The cursor will be positioned on the first line containing
 		"pat" in the first file being edited (see |pattern| for the
-		available search patterns).  The search starts at the cursor
-		position, which can be the first line or the cursor position
-		last used from |viminfo|. To force a search from the first
-		line use "+1 +/pat".
+		available search patterns).

 +{command}						*-+c* *-c*
 -c {command}	{command} will be executed after the first file has been
@@ -795,8 +792,7 @@ accordingly.  Vim proceeds in this order:
 	Note that this file is ALWAYS read in 'compatible' mode, since the
 	automatic resetting of 'compatible' is only done later.  Add a ":set
 	nocp" command if you like.
-	For the Macintosh the $VIMRUNTIME/macmap.vim is read (not on
-	MacVim.app, this only applies to the older Carbon version).
+	For the Macintosh the $VIMRUNTIME/macmap.vim is read.

 	  *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* *$MYVIMRC*
     c. Four places are searched for initializations.  The first that exists
@@ -1280,10 +1276,8 @@ triggered.
 			When [!] is included an existing file is overwritten.
 			When [file] is omitted or is a number from 1 to 9, a
 			name is generated and 'viewdir' prepended.  When the
-			last path part of 'viewdir' does not exist, this
-			directory is created.  E.g., when 'viewdir' is
-			"$VIM/vimfiles/view" then "view" is created in
-			"$VIM/vimfiles".
+			last directory name in 'viewdir' does not exist, this
+			directory is created.
 			An existing file is always overwritten then.  Use
 			|:loadview| to load this view again.
 			When [file] is the name of a file ('viewdir' is not
@@ -1507,7 +1501,7 @@ most of the information will be restored).
 			already set (registers, marks, |v:oldfiles|, etc.)
 			will be overwritten   {not in Vi}

-				*:wv* *:wviminfo* *E137* *E138* *E574* *E886*
+					*:wv* *:wviminfo* *E137* *E138* *E574*
 :wv[iminfo][!] [file]	Write to viminfo file [file] (default: see above).
 			The information in the file is first read in to make
 			a merge between old and new info.  When [!] is used,
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.4.  Last change: 2015 Nov 05
+*syntax.txt*	For Vim version 7.4.  Last change: 2013 Jul 05


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -211,8 +211,7 @@ thing.  These are then linked to a highlight group that specifies the color.
 A syntax group name doesn't specify any color or attributes itself.

 The name for a highlight or syntax group must consist of ASCII letters, digits
-and the underscore.  As a regexp: "[a-zA-Z0-9_]*".  However, Vim does not give
-an error when using other characters.
+and the underscore.  As a regexp: "[a-zA-Z0-9_]*"

 To be able to allow each user to pick his favorite set of colors, there must
 be preferred names for highlight groups that are common for many languages.
@@ -422,19 +421,18 @@ and last line to be converted.  Example, using the last set Visual area: >
 							*:TOhtml*
 :[range]TOhtml		The ":TOhtml" command is defined in a standard plugin.
 			This command will source |2html.vim| for you. When a
-			range is given, this command sets |g:html_start_line|
-			and |g:html_end_line| to the start and end of the
-			range, respectively. Default range is the entire
-			buffer.
+			range is given, set |g:html_start_line| and
+			|g:html_end_line| to the start and end of the range,
+			respectively. Default range is the entire buffer.

-			If the current window is part of a |diff|, unless
-			|g:html_diff_one_file| is set, :TOhtml will convert
-			all windows which are part of the diff in the current
-			tab and place them side-by-side in a <table> element
-			in the generated HTML. With |g:html_line_ids| you can
-			jump to lines in specific windows with (for example)
-			#W1L42 for line 42 in the first diffed window, or
-			#W3L87 for line 87 in the third.
+                        If the current window is part of a |diff|, unless
+                        |g:html_diff_one_file| is set, :TOhtml will convert
+                        all windows which are part of the diff in the current
+                        tab and place them side-by-side in a <table> element
+                        in the generated HTML. With |g:html_line_ids| you can
+                        jump to lines in specific windows with (for example)
+                        #W1L42 for line 42 in the first diffed window, or
+                        #W3L87 for line 87 in the third.

 			Examples: >

@@ -503,7 +501,7 @@ inserted for that purpose if no line numbers are shown. This ID attribute
 takes the form of L123 for single-buffer HTML pages, or W2L123 for diff-view
 pages, and is used to jump to a specific line (in a specific window of a diff
 view). Javascript is inserted to open any closed dynamic folds
-(|g:html_dynamic_folds|) containing the specified line before jumping. The
+(|g:html_dynamic_folds|) containing the specificed line before jumping. The
 javascript also allows omitting the window ID in the url, and the leading L.
 For example: >

@@ -748,22 +746,6 @@ and UTF-32 instead, use: >
 Note that documents encoded in either UTF-32 or UTF-16 have known
 compatibility problems with some major browsers.

-								 *g:html_font*
-Default: "monospace"
-You can specify the font or fonts used in the converted document using
-g:html_font. If this option is set to a string, then the value will be
-surrounded with single quotes. If this option is set to a list then each list
-item is surrounded by single quotes and the list is joined with commas. Either
-way, "monospace" is added as the fallback generic family name and the entire
-result used as the font family (using CSS) or font face (if not using CSS).
-Examples: >
-
-   " font-family: 'Consolas', monospace;
-   :let g:html_font = "Consolas"
-
-   " font-family: 'DejaVu Sans Mono', 'Consolas', monospace;
-   :let g:html_font = ["DejaVu Sans Mono", "Consolas"]
-<
 			*convert-to-XML* *convert-to-XHTML* *g:html_use_xhtml*
 Default: 0.
 When 0, generate standard HTML 4.01 (strict when possible).
@@ -1040,21 +1022,6 @@ Or to avoid the highlighting: >
 This works immediately.


-CLOJURE							*ft-clojure-syntax*
-
-Setting *g:clojure_fold* enables folding Clojure code via the syntax engine.
-Any list, vector, or map that extends over more than one line can be folded
-using the standard Vim |fold-commands|.
-
-Please note that this option does not work with scripts that redefine the
-bracket syntax regions, such as rainbow-parentheses plugins.
-
-This option is off by default.
->
-	" Default
-	let g:clojure_fold = 0
-<
-
 COBOL						*cobol.vim* *ft-cobol-syntax*

 COBOL highlighting has different needs for legacy code than it does for fresh
@@ -1081,8 +1048,7 @@ CPP						*cpp.vim* *ft-cpp-syntax*
 Most of things are same as |ft-c-syntax|.

 Variable		Highlight ~
-cpp_no_cpp11		don't highlight C++11 standard items
-cpp_no_cpp14		don't highlight C++14 standard items
+cpp_no_c11		don't highlight C++11 standard items


 CSH						*csh.vim* *ft-csh-syntax*
@@ -1147,16 +1113,6 @@ to standard by placing this in your vimrc file: >
 	:let enforce_freedesktop_standard = 1


-DIFF							*diff.vim*
-
-The diff highlighting normally finds translated headers.  This can be slow if
-there are very long lines in the file.  To disable translations: >
-
-	:let diff_translations = 0
-
-Also see |diff-slow|.
-
-
 DIRCOLORS			       *dircolors.vim* *ft-dircolors-syntax*

 The dircolors utility highlighting definition has one option.  It exists to
@@ -1325,32 +1281,6 @@ Finally, some vendors support hexadecimal constants.  To handle them, add >
 to your startup file.


-EUPHORIA	    *euphoria3.vim* *euphoria4.vim* *ft-euphoria-syntax*
-
-Two syntax highlighting files exists for Euphoria. One for Euphoria 
-version 3.1.1, which is the default syntax highlighting file, and one for 
-Euphoria version 4.0.5 or later.
-
-Euphoria version 3.1.1 (http://www.rapideuphoria.com/) is still necessary 
-for developing applications for the DOS platform, which Euphoria version 4 
-(http://www.openeuphoria.org/) does not support.
-
-The following file extensions are auto-detected as Euphoria file type: 
-    
-	*.e, *.eu, *.ew, *.ex, *.exu, *.exw
-	*.E, *.EU, *.EW, *.EX, *.EXU, *.EXW
-
-To select syntax highlighting file for Euphoria, as well as for 
-auto-detecting the *.e and *.E file extensions as Euphoria file type,
-add the following line to your startup file: >
-
-	:let filetype_euphoria="euphoria3"
-
-	or 
-
-	:let filetype_euphoria="euphoria4"
-
-
 ERLANG						*erlang.vim* *ft-erlang-syntax*

 Erlang is a functional programming language developed by Ericsson.  Files with
@@ -1717,7 +1647,7 @@ vimrc file: >
 HTML comments are rather special (see an HTML reference document for the
 details), and the syntax coloring scheme will highlight all errors.
 However, if you prefer to use the wrong style (starts with <!-- and
-ends with -->) you can define >
+ends with --!>) you can define >
 	:let html_wrong_comments=1

 JavaScript and Visual Basic embedded inside HTML documents are highlighted as
@@ -1988,7 +1918,7 @@ If you don't want to set the variable, use the modeline in EVERY LPC file.
 There are several implementations for LPC, we intend to support most widely
 used ones.  Here the default LPC syntax is for MudOS series, for MudOS v22
 and before, you should turn off the sensible modifiers, and this will also
-assert the new efuns after v22 to be invalid, don't set this variable when
+asserts the new efuns after v22 to be invalid, don't set this variable when
 you are using the latest version of MudOS: >

 	:let lpc_pre_v22 = 1
@@ -2308,7 +2238,7 @@ files, you may set the 'perl_include_pod' option to 0: >

 	:let perl_include_pod = 0

-To reduce the complexity of parsing (and increase performance) you can switch
+The reduce the complexity of parsing (and increase performance) you can switch
 off two elements in the parsing of variable names and contents. >

 To handle package references in variable and function names not differently
@@ -3004,7 +2934,6 @@ TEX				*tex.vim* *ft-tex-syntax* *latex-syntax*
 	Tex: Taking Advantage of Conceal Mode		|tex-conceal|
 	Tex: Selective Conceal Mode			|g:tex_conceal|
 	Tex: Controlling iskeyword			|g:tex_isk|
-	Tex: Fine Subscript and Superscript Control	|tex-supersub|

 				*tex-folding* *g:tex_fold_enabled*
 Tex: Want Syntax Folding? ~
@@ -3098,7 +3027,6 @@ selectively to enable just some syntax highlighting: >
 <
 As an example, let g:tex_fast= "M" will allow math-associated highlighting
 but suppress all the other region-based syntax highlighting.
-(also see: |g:tex_conceal| and |tex-supersub|)

 					*tex-morecommands* *tex-package*
 Tex: Want To Highlight More Commands? ~
@@ -3200,28 +3128,6 @@ syntax highlighting script handles this with the following logic:
 	* If g:tex_isk exists, then it will be used for the local 'iskeyword'
 	* Else the local 'iskeyword' will be set to 48-57,a-z,A-Z,192-255

-			*tex-supersub* *g:tex_superscripts* *g:tex_subscripts*
- Tex: Fine Subscript and Superscript Control~
-
-	See |tex-conceal| for how to enable concealed character replacement.
-
-	See |g:tex_conceal| for selectively concealing accents, bold/italic,
-	math, Greek, and superscripts/subscripts.
-
-	One may exert fine control over which superscripts and subscripts one
-	wants syntax-based concealment for (see |:syn-cchar|).  Since not all
-	fonts support all characters, one may override the
-	concealed-replacement lists; by default these lists are given by: >
-
-	    let g:tex_superscripts= "[0-9a-zA-W.,:;+-<>/()=]"
-	    let g:tex_subscripts= "[0-9aehijklmnoprstuvx,+-/().]"
-<
-	For example, I use Luxi Mono Bold; it doesn't support subscript
-	characters for "hklmnpst", so I put >
-		let g:tex_subscripts= "[0-9aeijoruvx,+-/().]"
-<	in ~/.vim/ftplugin/tex/tex.vim in order to avoid having inscrutable
-	utf-8 glyphs appear.
-

 TF						*tf.vim* *ft-tf-syntax*

@@ -3249,18 +3155,19 @@ improve screen updating rates (see |:syn-sync| for more on this). >
 The g:vimsyn_embed option allows users to select what, if any, types of
 embedded script highlighting they wish to have. >

-   g:vimsyn_embed == 0   : don't support any embedded scripts
-   g:vimsyn_embed =~ 'l' : support embedded lua
-   g:vimsyn_embed =~ 'm' : support embedded mzscheme
-   g:vimsyn_embed =~ 'p' : support embedded perl
-   g:vimsyn_embed =~ 'P' : support embedded python
-   g:vimsyn_embed =~ 'r' : support embedded ruby
-   g:vimsyn_embed =~ 't' : support embedded tcl
+   g:vimsyn_embed == 0   : don't embed any scripts
+   g:vimsyn_embed =~ 'm' : embed mzscheme (but only if vim supports it)
+   g:vimsyn_embed =~ 'p' : embed perl     (but only if vim supports it)
+   g:vimsyn_embed =~ 'P' : embed python   (but only if vim supports it)
+   g:vimsyn_embed =~ 'r' : embed ruby     (but only if vim supports it)
+   g:vimsyn_embed =~ 't' : embed tcl      (but only if vim supports it)
 <
-By default, g:vimsyn_embed is a string supporting interpreters that your vim
-itself supports.  Concatenate multiple characters to support multiple types
-of embedded interpreters; ie. g:vimsyn_embed= "mp" supports embedded mzscheme
-and embedded perl.
+By default, g:vimsyn_embed is "mpPr"; ie. syntax/vim.vim will support
+highlighting mzscheme, perl, python, and ruby by default.  Vim's has("tcl")
+test appears to hang vim when tcl is not truly available.  Thus, by default,
+tcl is not supported for embedding (but those of you who like tcl embedded in
+their vim syntax highlighting can simply include it in the g:vimembedscript
+option).
 						*g:vimsyn_folding*

 Some folding is now supported with syntax/vim.vim: >
@@ -3268,7 +3175,6 @@ Some folding is now supported with syntax/vim.vim: >
   g:vimsyn_folding == 0 or doesn't exist: no syntax-based folding
   g:vimsyn_folding =~ 'a' : augroups
   g:vimsyn_folding =~ 'f' : fold functions
-   g:vimsyn_folding =~ 'l' : fold lua      script
   g:vimsyn_folding =~ 'm' : fold mzscheme script
   g:vimsyn_folding =~ 'p' : fold perl     script
   g:vimsyn_folding =~ 'P' : fold python   script
@@ -3342,32 +3248,6 @@ must not click outside of the pixel strings, but feel free to improve it.
 It will look much better with a font in a quadratic cell size, e.g. for X: >
 	:set guifont=-*-clean-medium-r-*-*-8-*-*-*-*-80-*

-
-YAML						*yaml.vim* *ft-yaml-syntax*
-
-					*g:yaml_schema* *b:yaml_schema*
-A YAML schema is a combination of a set of tags and a mechanism for resolving 
-non-specific tags. For user this means that YAML parser may, depending on 
-plain scalar contents, treat plain scalar (which can actually be only string 
-and nothing else) as a value of the other type: null, boolean, floating-point, 
-integer. `g:yaml_schema` option determines according to which schema values 
-will be highlighted specially. Supported schemas are
-
-Schema		Description ~
-failsafe	No additional highlighting.
-json		Supports JSON-style numbers, booleans and null.
-core		Supports more number, boolean and null styles.
-pyyaml		In addition to core schema supports highlighting timestamps, 
-		but there are some differences in what is recognized as 
-		numbers and many additional boolean values not present in core 
-		schema.
-
-Default schema is `core`.
-
-Note that schemas are not actually limited to plain scalars, but this is the 
-only difference between schemas defined in YAML specification and the only 
-difference defined in the syntax file.
-
 ==============================================================================
 5. Defining a syntax					*:syn-define* *E410*

@@ -3465,7 +3345,7 @@ DEFINING KEYWORDS					*:syn-keyword*
  :syntax keyword   Type   contained int long char
  :syntax keyword   Type   int long contained char
  :syntax keyword   Type   int long char contained
-<								*E789* *E890*
+<								*E789*
 	When you have a keyword with an optional tail, like Ex commands in
 	Vim, you can put the optional characters inside [], to define all the
 	variations at once: >
@@ -3719,7 +3599,6 @@ Whether or not it is actually concealed depends on the value of the
 'conceallevel' option.  The 'concealcursor' option is used to decide whether
 concealable items in the current line are displayed unconcealed to be able to
 edit the line.
-Another way to conceal text with with |matchadd()|.

 concealends						*:syn-concealends*

@@ -3857,7 +3736,7 @@ The 'foldnestmax' option limits the nesting of syntax folds.


 			*:syn-contains* *E405* *E406* *E407* *E408* *E409*
-contains={group-name},..
+contains={groupname},..

 The "contains" argument is followed by a list of syntax group names.  These
 groups will be allowed to begin inside the item (they may extend past the
@@ -3910,13 +3789,13 @@ region where contained items do match.	Note that this may also limit the
 area that is highlighted


-containedin={group-name}...				*:syn-containedin*
+containedin={groupname}...				*:syn-containedin*

 The "containedin" argument is followed by a list of syntax group names.  The
 item will be allowed to begin inside these groups.  This works as if the
 containing item has a "contains=" argument that includes this item.

-The {group-name}... can be used just like for "contains", as explained above.
+The {groupname}... can be used just like for "contains", as explained above.

 This is useful when adding a syntax item afterwards.  An item can be told to
 be included inside an already existing item, without changing the definition
@@ -3932,7 +3811,7 @@ keywords never contain another item, thus adding them to "containedin" won't
 work.


-nextgroup={group-name},..				*:syn-nextgroup*
+nextgroup={groupname},..				*:syn-nextgroup*

 The "nextgroup" argument is followed by a list of syntax group names,
 separated by commas (just like with "contains", so you can also use patterns).
@@ -4166,7 +4045,7 @@ example, for instance, can be done like this: >

 As can be seen here, the \z actually does double duty.	In the start pattern,
 it marks the "\(\I\i*\)" sub-expression as external; in the end pattern, it
-changes the \z1 back-reference into an external reference referring to the
+changes the \1 back-reference into an external reference referring to the
 first external sub-expression in the start pattern.  External references can
 also be used in skip patterns: >
  :syn region foo start="start \(\I\i*\)" skip="not end \z1" end="end \z1"
@@ -4301,7 +4180,7 @@ If the "maxlines={N}" argument is given, the number of lines that are searched
 for a comment or syncing pattern is restricted to N lines backwards (after
 adding "minlines").  This is useful if you have few things to sync on and a
 slow machine.  Example: >
-   :syntax sync maxlines=500 ccomment
+   :syntax sync ccomment maxlines=500
 <
 						*:syn-sync-linebreaks*
 When using a pattern that matches multiple lines, a change in one line may
@@ -4695,8 +4574,6 @@ ctermbg={color-nr}				*highlight-ctermbg*
 	Note that for some color terminals these names may result in the wrong
 	colors!

-	You can also use "NONE" to remove the color.
-
 							*:hi-normal-cterm*
 	When setting the "ctermfg" or "ctermbg" colors for the Normal group,
 	these will become the colors used for the non-highlighted text.
@@ -4780,8 +4657,8 @@ guisp={color-name}					*highlight-guisp*
 	    Black	White
 	    Orange	Purple		Violet

-	In the Win32 and MacVim GUI versions, additional system colors are
-	available.  See |win32-colors| and |macvim-colors|.
+	In the Win32 GUI version, additional system colors are available.  See
+	|win32-colors|.

 	You can also specify a color by its Red, Green and Blue values.
 	The format is "#rrggbb", where
@@ -5125,7 +5002,6 @@ This will set the "w:current_syntax" variable to "foo".  The value of
 restoring "b:current_syntax", since the syntax files do set
 "b:current_syntax".  The value set by the syntax file is assigned to
 "w:current_syntax".
-Note: This resets the 'spell', 'spellcapcheck' and 'spellfile' options.

 Once a window has its own syntax, syntax commands executed from other windows
 on the same buffer (including :syntax clear) have no effect. Conversely,
@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 7.4.  Last change: 2015 Jan 04
+*tabpage.txt*   For Vim version 7.4.  Last change: 2012 Aug 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -61,25 +61,16 @@ In the GUI tab pages line you can use the right mouse button to open menu.
 :[count]tabe[dit]				*:tabe* *:tabedit* *:tabnew*
 :[count]tabnew
 		Open a new tab page with an empty window, after the current
-		tab page.  If [count] is given the new tab page appears after
-		the tab page [count] otherwise the new tab page will appear
-		after the current one. >
-		    :tabnew	" opens tabpage after the current one
-		    :.tabnew	" as above
-		    :+tabnew	" opens tabpage after the next tab page
-				" note: it is one further than :tabnew
-		    :-tabnew	" opens tabpage before the current one
-		    :0tabnew	" opens tabpage before the first one
-		    :$tabnew	" opens tabpage after the last one
+		tab page.  For [count] see |:tab| below.

 :[count]tabe[dit] [++opt] [+cmd] {file}
 :[count]tabnew [++opt] [+cmd] {file}
 		Open a new tab page and edit {file}, like with |:edit|.
-		For [count] see |:tabnew| above.
+		For [count] see |:tab| below.

 :[count]tabf[ind] [++opt] [+cmd] {file}			*:tabf* *:tabfind*
 		Open a new tab page and edit {file} in 'path', like with
-		|:find|.  For [count] see |:tabnew| above.
+		|:find|.  For [count] see |:tab| below.
 		{not available when the |+file_in_path| feature was disabled
 		at compile time}

@@ -119,18 +110,12 @@ something else.
 		- When 'hidden' is not set, [!] is not used, a buffer has
 		  changes, and there is no other window on this buffer.
 		Changes to the buffer are not written and won't get lost, so
-		this is a "safe" command. >
-		    :tabclose	    " close the current tab page
+		this is a "safe" command.

-:{count}tabc[lose][!]
 :tabc[lose][!] {count}
 		Close tab page {count}.  Fails in the same way as `:tabclose`
-		above. >
-		    :-tabclose	    " close the previous tab page
-		    :+tabclose	    " close the next tab page
-		    :1tabclose	    " close the first tab page
-		    :$tabclose	    " close the last tab page
-<
+		above.
+
 							*:tabo* *:tabonly*
 :tabo[nly][!]	Close all other tab pages.
 		When the 'hidden' option is set, all buffers in closed windows
@@ -139,17 +124,7 @@ something else.
 		modified buffers are written.  Otherwise, windows that have
 		buffers that are modified are not removed, unless the [!] is
 		given, then they become hidden.  But modified buffers are
-		never abandoned, so changes cannot get lost. >
-		    :tabonly	    " close all tab pages except the current
-
-:{count}tabo[nly][!]
-		Close all tab pages except the {count}th one. >
-		    :.tabonly	    " one
-		    :-tabonly	    " close all tab pages except the previous
-				    " one
-		    :+tabonly	    " close all tab pages except the next one
-		    :1tabonly	    " close all tab pages except the first one
-		    :$tabonly	    " close all tab pages except the last one
+		never abandoned, so changes cannot get lost.


 SWITCHING TO ANOTHER TAB PAGE:
@@ -201,39 +176,23 @@ REORDERING TAB PAGES:
 :[N]tabm[ove]
 		Move the current tab page to after tab page N.  Use zero to
 		make the current tab page the first one.  Without N the tab
-		page is made the last one. >
-		    :.tabmove	" do nothing
-		    :-tabmove	" move the tab page to the left
-		    :+tabmove	" move the tab page to the right
-		    :0tabmove	" move the tab page to the beginning of the tab
-				" list
-		    :tabmove 0	" as above
-		    :tabmove	" move the tab page to the last
-		    :$tabmove	" as above
-		    :tabmove $	" as above
+		page is made the last one.

 :tabm[ove] +[N]
 :tabm[ove] -[N]
 		Move the current tab page N places to the right (with +) or to
-		the left (with -). >
-		    :tabmove -	" move the tab page to the left
-		    :tabmove -1	" as above
-		    :tabmove +	" move the tab page to the right
-		    :tabmove +1	" as above
-
+		the left (with -).

 Note that although it is possible to move a tab behind the N-th one by using
-:Ntabmove. And move it by N places by using :+Ntabmove. For clarification what
-+N means in this context see |[range]|.
+:Ntabmove, it is impossible to move it by N places by using :+Ntabmove. For
+clarification what +N means in this context see |[range]|.


 LOOPING OVER TAB PAGES:

 							*:tabd* *:tabdo*
-:[range]tabd[o] {cmd}
-		Execute {cmd} in each tab page or if [range] is given only in
-		tab pages which tab page number is in the [range].  It works
-		like doing this: >
+:tabd[o] {cmd}	Execute {cmd} in each tab page.
+		It works like doing this: >
 			:tabfirst
 			:{cmd}
 			:tabnext
@@ -248,8 +207,7 @@ LOOPING OVER TAB PAGES:
 		{cmd} must not open or close tab pages or reorder them.
 		{not in Vi} {not available when compiled without the
 		|+listcmds| feature}
-		Also see |:windo|, |:argdo|, |:bufdo|, |:cdo|, |:ldo|, |:cfdo|
-		and |:lfdo|
+		Also see |:windo|, |:argdo| and |:bufdo|.

 ==============================================================================
 3. Other items						*tab-page-other*
@@ -280,8 +238,8 @@ window on the same buffer and then edit another buffer.  Thus ":tabnew"
 triggers:
 	WinLeave		leave current window
 	TabLeave		leave current tab page
-	WinEnter		enter window in new tab page
 	TabEnter		enter new tab page
+	WinEnter		enter window in new tab page
 	BufLeave		leave current buffer
 	BufEnter		enter new empty buffer

@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 7.4.  Last change: 2013 Oct 01
+*tagsrch.txt*   For Vim version 7.4.  Last change: 2013 Jul 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -771,11 +771,11 @@ CTRL-W i		Open a new window, with the cursor on the first line

 							*:dli* *:dlist*
 :[range]dli[st][!] [/]string[/]
-			Like `[D`  and `]D`, but search in [range] lines
+			Like "[D"  and "]D", but search in [range] lines
 			(default: whole file).
 			See |:search-args| for [/] and [!].  {not in Vi}
-			Note that `:dl` works like `:delete` with the "l"
-			flag, not `:dlist`.
+			Note that ":dl" works like ":delete" with the "l"
+			register.

 							*[_CTRL-D*
 [ CTRL-D		Jump to the first macro definition that contains the
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.4.  Last change: 2015 Jun 25
+*term.txt*      For Vim version 7.4.  Last change: 2013 Mar 13


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -224,11 +224,10 @@ The options are listed below.  The associated termcap code is always equal to
 the last two characters of the option name.  Only one termcap code is
 required: Cursor motion, 't_cm'.

-The options 't_da', 't_db', 't_ms', 't_xs', 't_xn' represent flags in the
-termcap.  When the termcap flag is present, the option will be set to "y".
-But any non-empty string means that the flag is set.  An empty string means
-that the flag is not set.  't_CS' works like this too, but it isn't a termcap
-flag.
+The options 't_da', 't_db', 't_ms', 't_xs' represent flags in the termcap.
+When the termcap flag is present, the option will be set to "y".  But any
+non-empty string means that the flag is set.  An empty string means that the
+flag is not set.  't_CS' works like this too, but it isn't a termcap flag.

 OUTPUT CODES
 	option	meaning	~
@@ -282,9 +281,6 @@ OUTPUT CODES
 	t_vs	cursor very visible				*t_vs* *'t_vs'*
 								*t_xs* *'t_xs'*
 	t_xs	if non-empty, standout not erased by overwriting (hpterm)
-								*t_xn* *'t_xn'*
-	t_xn	if non-empty, writing a character at the last screen cell
-		does not cause scrolling
 	t_ZH	italics mode					*t_ZH* *'t_ZH'*
 	t_ZR	italics end					*t_ZR* *'t_ZR'*

@@ -294,15 +290,12 @@ Added by Vim (there are no standard codes for these):
 	t_WP	set window position (Y, X) in pixels		*t_WP* *'t_WP'*
 	t_WS	set window size (height, width) in characters	*t_WS* *'t_WS'*
 	t_SI	start insert mode (bar cursor shape)		*t_SI* *'t_SI'*
-	t_SR	start replace mode (underline cursor shape)	*t_SR* *'t_SR'*
-	t_EI	end insert or replace mode (block cursor shape)	*t_EI* *'t_EI'*
+	t_EI	end insert mode (block cursor shape)		*t_EI* *'t_EI'*
 		|termcap-cursor-shape|
 	t_RV	request terminal version string (for xterm)	*t_RV* *'t_RV'*
 		|xterm-8bit| |v:termresponse| |'ttymouse'| |xterm-codes|
 	t_u7	request cursor position (for xterm)		*t_u7* *'t_u7'*
 		see |'ambiwidth'|
-	t_RB	request terminal background color		*t_RB* *'t_RB'*
-		see |'ambiwidth'|

 KEY CODES
 Note: Use the <> form if possible
@@ -417,7 +410,7 @@ adjust the various t_ codes.  This avoids the problem that the xterm can
 produce different codes, depending on the mode it is in (8-bit, VT102,
 VT220, etc.).  The result is that codes like <xF1> are no longer needed.
 Note: This is only done on startup.  If the xterm options are changed after
-Vim has started, the escape sequences may not be recognized anymore.
+Vim has started, the escape sequences may not be recognized any more.

 							*xterm-resize*
 Window resizing with xterm only works if the allowWindowOps resource is
@@ -441,16 +434,13 @@ If one of these is not available, 't_Sb' and 't_Sf' are used.  't_me' is used
 to reset to the default colors.

 				*termcap-cursor-shape* *termcap-cursor-color*
-When Vim enters Insert mode the 't_SI' escape sequence is sent.  When Vim
-enters Replace mode the 't_SR' escape sequence is sent if it is set, otherwise
-'t_SI' is sent.  When leaving Insert mode or Replace mode 't_EI' is used. This
-can be used to change the shape or color of the cursor in Insert or Replace
-mode. These are not standard termcap/terminfo entries, you need to set them
-yourself.
+When Vim enters Insert mode the 't_SI' escape sequence is sent.  When leaving
+Insert mode 't_EI' is used.  But only if both are defined.  This can be used
+to change the shape or color of the cursor in Insert mode.  These are not
+standard termcap/terminfo entries, you need to set them yourself.
 Example for an xterm, this changes the color of the cursor: >
    if &term =~ "xterm"
 	let &t_SI = "\<Esc>]12;purple\x7"
-	let &t_SR = "\<Esc>]12;red\x7"
 	let &t_EI = "\<Esc>]12;blue\x7"
    endif
 NOTE: When Vim exits the shape for Normal mode will remain.  The shape from
@@ -676,8 +666,8 @@ When the X-server clipboard is available, the command server described in

 							*xterm-copy-paste*
 NOTE: In some (older) xterms, it's not possible to move the cursor past column
-95 or 223.  This is an xterm problem, not Vim's.  Get a newer xterm
-|color-xterm|.  Also see |'ttymouse'|.
+95.  This is an xterm problem, not Vim's.  Get a newer xterm |color-xterm|.
+Now the limit is 223 columns.

 Copy/paste in xterm with (current mode NOT included in 'mouse'):
 1. Press left mouse button on first letter of text, move mouse pointer to last
@@ -194,7 +194,7 @@ child, you should have the intention to do this for at least one year.

 How do you know that the money will be spent right?  First of all you have my
 personal guarantee as the author of Vim.  I trust the people that are working
-at the centre, I know them personally.  Furthermore, the centre has been
+at the centre, I know them personally.  Further more, the centre has been
 co-sponsored and inspected by World Vision, Save the Children Fund and is now
 under the supervision of Pacific Academy Outreach Society.  The centre is
 visited about once a year to check the progress (at our own cost).  I have
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.4.  Last change: 2014 May 24
+*undo.txt*      For Vim version 7.4.  Last change: 2012 Mar 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -57,7 +57,7 @@ Use "u" to undo changes until the buffer becomes unchanged.
 2. Two ways of undo					*undo-two-ways*

 How undo and redo commands work depends on the 'u' flag in 'cpoptions'.
-There is the Vim way ('u' excluded) and the Vi-compatible way ('u' included).
+There is the Vim way ('u' excluded) and the vi-compatible way ('u' included).
 In the Vim way, "uu" undoes two changes.  In the Vi-compatible way, "uu" does
 nothing (undoes an undo).

@@ -97,9 +97,9 @@ change but joins in with the previous change use this command:
 			or redo.
 			{not in Vi}

-This is most useful when you need to prompt the user halfway through a change.
-For example in a function that calls |getchar()|.  Do make sure that there was
-a related change before this that you must join with.
+This is most useful when you need to prompt the user halfway a change.  For
+example in a function that calls |getchar()|.  Do make sure that there was a
+related change before this that you must join with.

 This doesn't work by itself, because the next key press will start a new
 change again.  But you can do something like this: >
@@ -249,9 +249,8 @@ a simple scheme that maps filesystem paths directly to undo files. Vim will
 detect if an undo file is no longer synchronized with the file it was written
 for (with a hash of the file contents) and ignore it when the file was changed
 after the undo file was written, to prevent corruption.  An undo file is also
-ignored if its owner differs from the owner of the edited file, except when
-the owner of the undo file is the current user.  Set 'verbose' to get a
-message about that when opening a file.
+ignored if its owner differs from the owner of the edited file.  Set 'verbose'
+to get a message about that when opening a file.

 Undo files are normally saved in the same directory as the file.  This can be
 changed with the 'undodir' option.
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.4.  Last change: 2015 Apr 12
+*usr_02.txt*	For Vim version 7.4.  Last change: 2010 Jul 20

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -527,11 +527,9 @@ Summary: 					*help-summary*  >
 	:help subject()
 <		Function "subject". >
 	:help -subject
-<		Command-line argument "-subject". >
+<		Command-line option "-subject". >
 	:help +subject
 <		Compile-time feature "+subject". >
-	:help /*
-<		Regular expression item "*" >
 	:help EventName
 <		Autocommand event "EventName". >
 	:help digraphs.txt
@@ -532,7 +532,7 @@ MATCHING ANY SINGLE CHARACTER

 The . (dot) character matches any existing character.  For example, the
 pattern "c.m" matches a string whose first character is a c, whose second
-character is anything, and whose third character is m.  Example:
+character is anything, and whose the third character is m.  Example:

 	We use a computer that became the cummin winter. ~
 		 xxx		 xxx	  xxx
@@ -1,4 +1,4 @@
-*usr_04.txt*	For Vim version 7.4.  Last change: 2014 Aug 29
+*usr_04.txt*	For Vim version 7.4.  Last change: 2008 Sep 06

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -186,7 +186,7 @@ commands:
 	/four<Enter>	find the first string "four"
 	cwfive<Esc>	change the word to "five"
 	n		find the next "four"
-	.		repeat the change to "five"
+	.		repeat the change to "five'
 	n		find the next "four"
 	.		repeat the change
 			etc.
@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 7.4.  Last change: 2014 Jul 06
+*usr_08.txt*	For Vim version 7.4.  Last change: 2006 Jul 18

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -532,7 +532,7 @@ window.  And you will notice a bar at the top with the two file names:

 You now have two tab pages.  The first one has a window for "thisfile" and the
 second one a window for "thatfile".  It's like two pages that are on top of
-each other, with a tab sticking out of each page showing the file name.
+eachother, with a tab sticking out of each page showing the file name.

 Now use the mouse to click on "thisfile" in the top line.  The result is

@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.4.  Last change: 2014 Oct 29
+*usr_25.txt*	For Vim version 7.4.  Last change: 2007 May 11

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -86,7 +86,7 @@ line, type: >

 	v4jgq

-"v" to start Visual mode, "4j" to move to the end of the paragraph and then
+"v" to start Visual mode, "4j' to move to the end of the paragraph and then
 the "gq" operator.  The result is:

 		 1	   2	     3
@@ -402,7 +402,7 @@ the cursor keys: >
 	:map <Down> gj


-TURNING A PARAGRAPH INTO ONE LINE			*edit-paragraph-join*
+TURNING A PARAGRAPH INTO ONE LINE

 If you want to import text into a program like MS-Word, each paragraph should
 be a single line.  If your paragraphs are currently separated with empty
@@ -128,7 +128,7 @@ be escaped with a backslash.  Example: >
 You can include special Vim keywords in the command specification.  The %
 character expands to the name of the current file.  So if you execute the
 command: >
-	:set makeprg=make\ %:S
+	:set makeprg=make\ %

 When you are editing main.c, then ":make" executes the following command: >

@@ -137,7 +137,7 @@ When you are editing main.c, then ":make" executes the following command: >
 This is not too useful, so you will refine the command a little and use the :r
 (root) modifier: >

-	:set makeprg=make\ %:r:S.o
+	:set makeprg=make\ %:r.o

 Now the command executed is as follows: >

@@ -209,7 +209,7 @@ The ":map" command can be followed by another command.  A | character
 separates the two commands.  This also means that a | character can't be used
 inside a map command.  To include one, use <Bar> (five characters).  Example:
 >
-	:map <F8> :write <Bar> !checkin %:S<CR>
+	:map <F8> :write <Bar> !checkin %<CR>

 The same problem applies to the ":unmap" command, with the addition that you
 have to watch out for trailing white space.  These two commands are different:
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.4.  Last change: 2014 Aug 16
+*usr_41.txt*	For Vim version 7.4.  Last change: 2013 Feb 20

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -595,17 +595,13 @@ String manipulation:					*string-functions*
 	matchlist()		like matchstr() and also return submatches
 	stridx()		first index of a short string in a long string
 	strridx()		last index of a short string in a long string
-	strlen()		length of a string in bytes
-	strchars()		length of a string in characters
-	strwidth()		size of string when displayed
-	strdisplaywidth()	size of string when displayed, deals with tabs
+	strlen()		length of a string
 	substitute()		substitute a pattern match with a string
 	submatch()		get a specific match in ":s" and substitute()
 	strpart()		get part of a string
 	expand()		expand special keywords
 	iconv()			convert text from one encoding to another
 	byteidx()		byte index of a character in a string
-	byteidxcomp()		like byteidx() but count composing characters
 	repeat()		repeat a string multiple times
 	eval()			evaluate a string expression

@@ -623,7 +619,6 @@ List manipulation:					*list-functions*
 	map()			change each List item
 	sort()			sort a List
 	reverse()		reverse the order of a List
-	uniq()			remove copies of repeated adjacent items
 	split()			split a String into a List
 	join()			join List items into a String
 	range()			return a List with a sequence of numbers
@@ -661,9 +656,6 @@ Floating point computation:				*float-functions*
 	ceil()			round up
 	floor()			round down
 	trunc()			remove value after decimal point
-	fmod()			remainder of division
-	exp()			exponential
-	log()			natural logarithm (logarithm to base e)
 	log10()			logarithm to base 10
 	pow()			value of x to the exponent y
 	sqrt()			square root
@@ -683,7 +675,6 @@ Other computation:					*bitwise-function*
 	invert()		bitwise invert
 	or()			bitwise OR
 	xor()			bitwise XOR
-	sha256()		SHA-256 hash

 Variables:						*var-functions*
 	type()			type of a variable
@@ -706,16 +697,11 @@ Cursor and mark position:		*cursor-functions* *mark-functions*
 	wincol()		window column number of the cursor
 	winline()		window line number of the cursor
 	cursor()		position the cursor at a line/column
-	screencol()		get screen column of the cursor
-	screenrow()		get screen row of the cursor
-	getcurpos()		get position of the cursor
 	getpos()		get position of cursor, mark, etc.
 	setpos()		set position of cursor, mark, etc.
 	byte2line()		get line number at a specific byte count
 	line2byte()		byte count at a specific line
 	diff_filler()		get the number of filler lines above a line
-	screenattr()		get attribute at a screen line/row
-	screenchar()		get character code at a screen line/row

 Working with text in the current buffer:		*text-functions*
 	getline()		get a line or list of lines from the buffer
@@ -743,7 +729,6 @@ System functions and manipulation of files:
 	pathshorten()		shorten directory names in a path
 	simplify()		simplify a path without changing its meaning
 	executable()		check if an executable program exists
-	exepath()		full path of an executable program
 	filereadable()		check if a file can be read
 	filewritable()		check if a file can be written to
 	getfperm()		get the permissions of a file
@@ -756,8 +741,7 @@ System functions and manipulation of files:
 	mkdir()			create a new directory
 	delete()		delete a file
 	rename()		rename a file
-	system()		get the result of a shell command as a string
-	systemlist()		get the result of a shell command as a list
+	system()		get the result of a shell command
 	hostname()		name of the system
 	readfile()		read a file into a List of lines
 	writefile()		write a List of lines into a file
@@ -773,7 +757,6 @@ Date and Time:				*date-functions* *time-functions*
 Buffers, windows and the argument list:
 	argc()			number of entries in the argument list
 	argidx()		current position in the argument list
-	arglistid()		get id of the argument list
 	argv()			get one entry from the argument list
 	bufexists()		check if a buffer exists
 	buflisted()		check if a buffer exists and is listed
@@ -793,7 +776,6 @@ Command line:					*command-line-functions*
 	getcmdpos()		get position of the cursor in the command line
 	setcmdpos()		set position of the cursor in the command line
 	getcmdtype()		return the current command-line type
-	getcmdwintype()		return the current command-line window type

 Quickfix and location lists:			*quickfix-functions*
 	getqflist()		list of quickfix errors
@@ -828,7 +810,6 @@ Syntax and highlighting:	  *syntax-functions* *highlighting-functions*
 	synconcealed()		get info about concealing
 	diff_hlID()		get highlight ID for diff mode at a position
 	matchadd()		define a pattern to highlight (a "match")
-	matchaddpos()		define a list of positions to highlight
 	matcharg()		get info about |:match| arguments
 	matchdelete()		delete a match defined by |matchadd()| or a
 				|:match| command
@@ -902,22 +883,14 @@ Various:					*various-functions*
 	libcall()		call a function in an external library
 	libcallnr()		idem, returning a number

-	undofile()		get the name of the undo file
-	undotree()		return the state of the undo tree
-
 	getreg()		get contents of a register
 	getregtype()		get type of a register
 	setreg()		set contents and type of a register

-	shiftwidth()		effective value of 'shiftwidth'
-
 	taglist()		get list of matching tags
 	tagfiles()		get a list of tags files

-	luaeval()		evaluate Lua expression
 	mzeval()		evaluate |MzScheme| expression
-	py3eval()		evaluate Python expression (|+python3|)
-	pyeval()		evaluate Python expression (|+python|)

 ==============================================================================
 *41.7*	Defining a function
@@ -311,7 +311,7 @@ redefine what these items do (after the default menus are setup).
 item with a bitmap.  For example, define a new toolbar item with: >

 	:tmenu ToolBar.Compile  Compile the current file
-	:amenu ToolBar.Compile  :!cc %:S -o %:r:S<CR>
+	:amenu ToolBar.Compile  :!cc % -o %:r<CR>

 Now you need to create the icon.  For MS-Windows it must be in bitmap format,
 with the name "Compile.bmp".  For Unix XPM format is used, the file name is
@@ -1,4 +1,4 @@
-*usr_43.txt*	For Vim version 7.4.  Last change: 2015 Oct 23
+*usr_43.txt*	For Vim version 7.4.  Last change: 2008 Dec 28

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -46,7 +46,6 @@ three-line comment.  You do this with only two steps:

 	setlocal softtabstop=4
 	noremap <buffer> <LocalLeader>c o/**************<CR><CR>/<Esc>
-	let b:undo_ftplugin = "setl softtabstop< | unmap <buffer> <LocalLeader>c"

 Try editing a C file.  You should notice that the 'softtabstop' option is set
 to 4.  But when you edit another file it's reset to the default zero.  That is
@@ -61,11 +60,6 @@ buffer.  This works with any mapping command: ":map!", ":vmap", etc.  The
 |<LocalLeader>| in the mapping is replaced with the value of the
 "maplocalleader" variable.

-The line to set b:undo_ftplugin is for when the filetype is set to another
-value.  In that case you will want to undo your preferences.  The
-b:undo_ftplugin variable is executed as a command. Watch out for characters
-with a special meaning inside a string, such as a backslash.
-
 You can find examples for filetype plugins in this directory: >

 	$VIMRUNTIME/ftplugin/
@@ -328,8 +328,8 @@ actually use Vim to convert a file.  Example: >
 *45.5*	Entering language text

 Computer keyboards don't have much more than a hundred keys.  Some languages
-have thousands of characters, Unicode has over hundred thousand.  So how do
-you type these characters?
+have thousands of characters, Unicode has ten thousands.  So how do you type
+these characters?
   First of all, when you don't use too many of the special characters, you
 can use digraphs.  This was already explained in |24.9|.
   When you use a language that uses many more characters than keys on your
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.4.  Last change: 2015 Nov 15
+*various.txt*   For Vim version 7.4.  Last change: 2013 May 18


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -234,41 +234,25 @@ g8			Print the hex values of the bytes used in the
 							*:!cmd* *:!* *E34*
 :!{cmd}			Execute {cmd} with the shell.  See also the 'shell'
 			and 'shelltype' option.
-
 			Any '!' in {cmd} is replaced with the previous
 			external command (see also 'cpoptions').  But not when
 			there is a backslash before the '!', then that
 			backslash is removed.  Example: ":!ls" followed by
 			":!echo ! \! \\!" executes "echo ls ! \!".
-
+			After the command has been executed, the timestamp of
+			the current file is checked |timestamp|.
 			A '|' in {cmd} is passed to the shell, you cannot use
 			it to append a Vim command.  See |:bar|.
-
-			If {cmd} contains "%" it is expanded to the current
-			file name.  Special characters are not escaped, use
-			quotes to avoid their special meaning: >
-				:!ls "%"
-<			If the file name contains a "$" single quotes might
-			work better (but a single quote causes trouble): >
-				:!ls '%'
-<			This should always work, but it's more typing: >
-				:exe "!ls " . shellescape(expand("%"))
-<
 			A newline character ends {cmd}, what follows is
 			interpreted as a following ":" command.  However, if
 			there is a backslash before the newline it is removed
 			and {cmd} continues.  It doesn't matter how many
 			backslashes are before the newline, only one is
 			removed.
-
 			On Unix the command normally runs in a non-interactive
 			shell.  If you want an interactive shell to be used
 			(to use aliases) set 'shellcmdflag' to "-ic".
 			For Win32 also see |:!start|.
-
-			After the command has been executed, the timestamp and
-			size of the current file is checked |timestamp|.
-
 			Vim redraws the screen after the command is finished,
 			because it may have printed any text.  This requires a
 			hit-enter prompt, so that you can read any messages.
@@ -307,7 +291,6 @@ g8			Print the hex values of the bytes used in the
 			in the normal, big and huge versions of Vim.

 							*+feature-list*
-   *+acl*		|ACL| support included
   *+ARP*		Amiga only: ARP support included
 B  *+arabic*		|Arabic| language support
 N  *+autocmd*		|:autocmd|, automatic commands
@@ -337,7 +320,6 @@ N  *+dialog_con*	Support for |:confirm| with console dialog.
 N  *+dialog_con_gui*	Support for |:confirm| with GUI and console dialog.
 N  *+diff*		|vimdiff| and 'diff'
 N  *+digraphs*		|digraphs| *E196*
-m  *+directx*		Win32 GUI only: DirectX and |'renderoptions'|
   *+dnd*		Support for DnD into the "~ register |quote_~|.
 B  *+emacs_tags*	|emacs-tags| files
 N  *+eval*		expression evaluation |eval.txt|
@@ -352,7 +334,6 @@ N  *+folding*		|folding|
   *+footer*		|gui-footer|
   *+fork*		Unix only: |fork| shell commands
   *+float*		Floating point support
-m  *+fullscreen*        MacVim only: edit in full-screen
 N  *+gettext*		message translations |multi-lang|
   *+GUI_Athena*	Unix only: Athena |GUI|
   *+GUI_neXtaw*	Unix only: neXtaw |GUI|
@@ -381,7 +362,6 @@ N  *+mouse*		Mouse handling |mouse-using|
 N  *+mouseshape*	|'mouseshape'|
 B  *+mouse_dec*		Unix only: Dec terminal mouse handling |dec-mouse|
 N  *+mouse_gpm*		Unix only: Linux console mouse handling |gpm-mouse|
-N  *+mouse_jsbterm*	JSB mouse handling |jsbterm-mouse|
 B  *+mouse_netterm*	Unix only: netterm mouse handling |netterm-mouse|
 N  *+mouse_pterm*	QNX only: pterm mouse handling |qnx-terminal|
 N  *+mouse_sysmouse*	Unix only: *BSD console mouse handling |sysmouse|
@@ -394,7 +374,6 @@ N  *+multi_lang*	non-English language support |multi-lang|
 m  *+mzscheme*		Mzscheme interface |mzscheme|
 m  *+mzscheme/dyn*	Mzscheme interface |mzscheme-dynamic| |/dyn|
 m  *+netbeans_intg*	|netbeans|
-m  *+odbeditor*		MacVim only: ODB Editor Protocol support |odbeditor|
 m  *+ole*		Win32 GUI only: |ole-interface|
 N  *+path_extra*	Up/downwards search in 'path' and 'tags'
 m  *+perl*		Perl interface |perl|
@@ -434,12 +413,11 @@ N  *+textobjects*	|text-objects| selection
   *+tgetent*		non-Unix only: able to use external termcap
 N  *+title*		Setting the window 'title' and 'icon'
 N  *+toolbar*		|gui-toolbar|
-m  *+transparency*      MacVim only: window background transparency
 N  *+user_commands*	User-defined commands. |user-commands|
 N  *+viminfo*		|'viminfo'|
 N  *+vertsplit*		Vertically split windows |:vsplit|
 N  *+virtualedit*	|'virtualedit'|
-S  *+visual*		Visual mode |Visual-mode| Always enabled since 7.4.200.
+S  *+visual*		Visual mode |Visual-mode|
 N  *+visualextra*	extra Visual mode commands |blockwise-operators|
 N  *+vreplace*		|gR| and |gr|
 N  *+wildignore*	|'wildignore'|
@@ -448,7 +426,6 @@ S  *+windows*		more than one window
 m  *+writebackup*	|'writebackup'| is default on
 m  *+xim*		X input method |xim|
   *+xfontset*		X fontset support |xfontset|
-   *+xpm*		pixmap support
 m  *+xpm_w32*		Win32 GUI only: pixmap support |w32-xpm-support|
   *+xsmp*		XSMP (X session management) support
   *+xsmp_interact*	interactive XSMP (X session management) support
@@ -668,12 +645,4 @@ highlighting.

 The "h" key will give you a short overview of the available commands.

-If you want to set options differently when using less, define the
-LessInitFunc in your vimrc, for example: >
-
-	func LessInitFunc()
-	  set nocursorcolumn nocursorline
-	endfunc
-<
-
 vim:tw=78:ts=8:ft=help:norl:
--- a/Show More
+++ b/Show More