Merge branch 'vim'

* vim: (310 commits)
  updated for version 7.4.622 Problem:    Compiler warning for unused argument. Solution:   Add UNUSED.
  updated for version 7.4.621 Problem:    Returning 1 in the wrong function. (Raymond Ko) Solution:   Return 1 in the right function (hopefully).
  updated for version 7.4.620 Problem:    Compiler warning for unitinialized variable. (Tony Mechelynck) Solution:   Initialize "did_free". (Ben Fritz)
  updated for version 7.4.619 Problem:    luaV_setref() not returning the correct value. Solution:   Return one.
  updated for version 7.4.618 Problem:    luaV_setref() is missing a return statement. (Ozaki Kiichi) Solution:   Put the return statement back.
  Update runtime files.
  updated for version 7.4.617 Problem:    Wrong ":argdo" range does not cause an error. Solution:   Reset "cmd" to NULL. (Marcin Szamotulski, Ingo Karkat)
  updated for version 7.4.616 Problem:    Cannot insert a tab in front of a block. Solution:   Correctly compute aop->start. (Christian Brabandt)
  updated for version 7.4.615 Problem:    Vim hangs when freeing a lot of objects. Solution:   Do not go back to the start of the list every time.  (Yasuhiro 	    Matsumoto and Ariya Mizutani)
  updated for version 7.4.614 Problem:    There is no test for what patch 7.4.601 fixes. Solution:   Add a test. (Christian Brabandt)
  updated for version 7.4.613 Problem:    The NFA engine does not implement the 'redrawtime' time limit. Solution:   Implement the time limit.
  updated for version 7.4.612 Problem:    test_eval fails on Mac. Solution:   Use the * register instead of the + register. (Jun Takimoto)
  updated for version 7.4.611 Problem:    Syntax error. Solution:   Change statement to return.
  updated for version 7.4.610 Problem:    Some function headers may be missing from generated .pro files. Solution:   Add PROTO to the #ifdef.
  updated for version 7.4.609 Problem:    For complicated list and dict use the garbage collector can run 	    out of stack space. Solution:   Use a stack of dicts and lists to be marked, thus making it 	    iterative instead of recursive. (Ben Fritz)
  updated for version 7.4.608 Problem:    test_eval fails when the clipboard feature is missing. Solution:   Skip part of the test. Reduce the text used.
  updated for version 7.4.607 Problem:    Compiler warnings for unused variables. Solution:   Move them inside #ifdef. (Kazunobu Kuriyama)
  updated for version 7.4.606 Problem:    May crash when using a small window. Solution:   Avoid dividing by zero. (Christian Brabandt)
  updated for version 7.4.605 Problem:    The # register is not writable, it cannot be restored after 	    jumping around. Solution:   Make the # register writable. (Marcin Szamotulski)
  updated for version 7.4.604 Problem:    Running tests changes viminfo. Solution:   Disable viminfo.
  ...

Signed-off-by: Douglas Drumond <drumond.douglas@gmail.com>

Author: douglasdrumond

.hgtags

@@ -3106,3 +3106,50 @@ c3bb76e5b2355c57d7f89997aa9e125e46afdea1 v7-4-376
 0a3d958e346ee051667d3e541273b78fb1dfed9a v7-4-381
 dbd7dc1ea2e6bd0fc3c9ec7faec76382412d0129 v7-4-382
 2f02675bc4b051fff7be63f5107f659045a010e1 v7-4-383
+6f88e2dafbf637f573372bb7d8957fe4f2fd0843 v7-4-384
+6e24b97dde6930a62ade6bee725babf4a39bb0a4 v7-4-385
+09af7cb358f0bafd4b7437ff580f4cd7e15b74a1 v7-4-386
+975d96776111914f69c8a0b98ef7db3bbb83cd10 v7-4-387
+76e7fb736c0e9d06b97ff95ee8baad1fb09d420b v7-4-388
+3d206df5c8284f7d5f4a987ae9c7a508f289f008 v7-4-389
+d3a674f6c7370f70d6b66dcefb9e36d22d73c7b7 v7-4-390
+f051e50a6a5feb0f0c6d209440d9d305b82f5836 v7-4-391
+589fd07888abc8a1208616c56b21898d3352fc5b v7-4-392
+1bff71d202621d97acc4ef21ce9f47b78f68bda3 v7-4-393
+d594c15521377493d5e23b03e4dbf5108df69acd v7-4-394
+65b0974c5bebf5d6b56e9abc90d86759d1c4f6d7 v7-4-395
+7766142fc7d3e90c2e15a9c606efcd97331edef8 v7-4-396
+8d361608fe86c534e51e4c7e583375642d34b7a4 v7-4-397
+f62b2e76dd809dc57cad9d0fd8f04a4f3a7193e9 v7-4-398
+18ac55444b37bcae8ea090f7b3abf4826c679bc3 v7-4-399
+50a658bf4cff030cbe6a97a53bb838b5976c2e1a v7-4-400
+ab71bb81b84e9a1cdf030b172f61d779ccda975c v7-4-401
+3aa37ad2c4ed4d4f979e7c7e7d5d88586c6b74ba v7-4-402
+86fb698a38d5c10f59928e57da94ce5b3e124a40 v7-4-403
+0242c27e40e1ce913ec2b6540371d5ea5fceeac9 v7-4-404
+4c25af735304ff17a27bb3ce21e7f7d3b304ff88 v7-4-405
+1134bba900c17abcecdc414c6e30da22c17d32a5 v7-4-406
+3f92ef156c664fb8fea1f036a4a4c87af487ba6b v7-4-407
+cb3218a69c2f0949bbff5bcf9beeccc83ef2ef59 v7-4-408
+de35e123e63c326be4a576f8e678ed9e63ed1f48 v7-4-409
+2fd550c75256cc1ecf06a4afc6a856b305cf7a8a v7-4-410
+d4e0c197e97968050596f4c441552383e31db63b v7-4-411
+4c845a1600d28db8edabd211e6d7a9cd03883ea6 v7-4-412
+121613e72e397db495f5e9b640b249aead5a61c1 v7-4-413
+67edf731a2403a8023440184872159ddc073093c v7-4-414
+20dbceb6f4713ccd01be45dc531abc269fbb7579 v7-4-415
+735bd597a8ffcb00edff68b34a26573b8f3cad9a v7-4-416
+e60327caf9095d5ec067a5ab47bf4a69c0f58580 v7-4-417
+00f58478e38b68faf783d8fe70c1439fe9dd732d v7-4-418
+0a42938f449cf306a429db373106d5e29d8d4312 v7-4-419
+93aa0340130912c69d4093fc626a3cbb0cc7ad68 v7-4-420
+3ee39fe2df7d60d6376b3429383c5c5e3f9bb3fe v7-4-421
+69da1498ce89dd093935c0e5013e1df8060a4e80 v7-4-422
+96a4fa8e530c12137af235a9aaad57d578f9eebd v7-4-423
+85a1802ae810f0e840f8b5d8f2827b4199b39750 v7-4-424
+2e804ebb3ee8cd59451f8f1c1be2f09ebce0d77a v7-4-425
+7ab9a9cf2859ae4b7c00c4fff016fd5a0869450e v7-4-426
+fca35aa9380a9e3acecc78f85e05f26436e87ae1 v7-4-427
+1fe61f6d52079f44f61b3e03cf9b0c300f2890d9 v7-4-428
+e98e415ea3b8c743a5ab04ad9f498ab1b11ae8cf v7-4-429
+f4e9c65a18d4a5753747f327ed55c10f05d8d91c v7-4-430

Filelist

@@ -11,6 +11,8 @@ SRC_ALL =	\
 		src/blowfish.c \
 		src/buffer.c \
 		src/charset.c \
+		src/crypt.c \
+		src/crypt_zip.c \
 		src/diff.c \
 		src/digraph.c \
 		src/edit.c \
@@ -80,6 +82,7 @@ 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 \
@@ -99,10 +102,15 @@ 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 \
@@ -272,6 +280,7 @@ SRC_DOS =	\
 		src/Make_bc3.mak \
 		src/Make_bc5.mak \
 		src/Make_cyg.mak \
+		src/Make_cyg_ming.mak \
 		src/Make_djg.mak \
 		src/Make_ivc.mak \
 		src/Make_dvc.mak \
@@ -289,6 +298,8 @@ SRC_DOS =	\
 		src/dosinst.h \
 		src/glbl_ime.cpp \
 		src/glbl_ime.h \
+		src/gui_dwrite.cpp \
+		src/gui_dwrite.h \
 		src/gui_w16.c \
 		src/gui_w32.c \
 		src/gui_w48.c \

nsis/gvim.nsi

@@ -1,6 +1,6 @@
 # NSIS file to create a self-installing exe for Vim.
 # It requires NSIS version 2.0 or later.
-# Last Change:	2010 Jul 30
+# Last Change:	2014 Nov 5
 
 # WARNING: if you make changes to this script, look out for $0 to be valid,
 # because uninstall deletes most files in $0.
@@ -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 (must end in 'vim')"
+DirText "Choose a directory to install Vim (should contain 'vim')"
 Icon icons\vim_16c.ico
 # NSIS2 uses a different strategy with six different images in a strip...
 #EnabledBitmap icons\enabled.bmp
@@ -135,11 +135,6 @@ FunctionEnd
 # We only accept the directory if it ends in "vim".  Using .onVerifyInstDir has
 # the disadvantage that the browse dialog is difficult to use.
 Function CheckInstallDir
-  StrCpy $0 $INSTDIR 3 -3
-  StrCmp $0 "vim" PathGood
-    MessageBox MB_OK "The path must end in 'vim'."
-    Abort
-  PathGood:
 FunctionEnd
 
 Function .onInstSuccess

runtime/autoload/gzip.vim

@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2008 Jul 04
+" Last Change: 2014 Nov 05
 
 " These functions are used by the gzip plugin.
 
@@ -120,6 +120,8 @@ fun gzip#read(cmd)
     silent! exe "bwipe " . tmp_esc
     silent! exe "bwipe " . tmpe_esc
   endif
+  " Store the OK flag, so that we can use it when writing.
+  let b:uncompressOk = ok
 
   " Restore saved option values.
   let &pm = pm_save
@@ -146,8 +148,10 @@ endfun
 
 " After writing compressed file: Compress written file with "cmd"
 fun gzip#write(cmd)
+  if exists('b:uncompressOk') && !b:uncompressOk
+    echomsg "Not compressing file because uncompress failed; reset b:uncompressOk to compress anyway"
   " don't do anything if the cmd is not supported
-  if s:check(a:cmd)
+  elseif s:check(a:cmd)
     " Rename the file before compressing it.
     let nm = resolve(expand("<afile>"))
     let nmt = s:tempname(nm)