Vim updated to v.7.4.608

.hgtags

@@ -3106,3 +3106,228 @@ 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
+5672a06e4bd84cae4194ff0584d487448bad8c38 v7-4-431
+59cd2b16f71846dec2e842491e509385beeda5e9 v7-4-432
+dd3dac42cb9b5f95ad16d5e08220b0c7adf4b024 v7-4-433
+4176c48c7dd51d0fcdb7403cbfb489a75b0d819d v7-4-434
+b98af9af378eebe674052aa9a1b1956ad3f96487 v7-4-435
+52fa8300ce205a8f3c45b3b1874564b7768630ea v7-4-436
+8515b42f939cdf3a59fa6120e989d9f8fe6f4571 v7-4-437
+db3b8fe8330ea2afabd6c4856be5c76ef86d4728 v7-4-438
+07b28e96af8bace1af65bac661f22716781103fd v7-4-439
+1f578cd9a65779d2597e0135a5916db621d65734 v7-4-440
+e754b23b7d1c3825dc2c6028867d631520a8cdca v7-4-441
+8c3c067b4ae3cc02ce4411042df05f97df5bc316 v7-4-442
+f1ba154c3a12d06cd0f40edbfc675103eb2dd7ad v7-4-443
+d4cc9f48d5a40382e3e3d52dfe6e948745ee13b4 v7-4-444
+1138726736fbdb92aa5259ca4b76573b8f4b3f79 v7-4-445
+63121fdd093ff71081725d5495337ea45d38daab v7-4-446
+0d2c821cdc2505879823a551baeeb8d3c61ce758 v7-4-447
+2fd96725b0632cd9183581ce13d7b2cbd734d8d4 v7-4-448
+cb5480096f1b9e8f44e9d742fa190a90d77e1c54 v7-4-449
+7c9abc70ffc187f9bb60d968cb7e3cc5ed6d4231 v7-4-450
+ac6cfdc02695b31b07e9beb60fd704f74f4d4c81 v7-4-451
+78aad99db7627a19574d10415780ded69936d7d7 v7-4-452
+c72eb8499a9d3f618de3528287d1de62025fdda4 v7-4-453
+0cdff7c268559f8f34eae073a013ece71b62b9e3 v7-4-454
+ebc72764fa1e74758ae1ef9d3f49301f80fc3aa4 v7-4-455
+54194bd6ed607aa0cec07d8a27d4794573eabba9 v7-4-456
+96761b6789f61a8dee1551b7cea98e669fb90fb3 v7-4-457
+fe1827921d50cb59ac680ea13e3f9103cd9db660 v7-4-458
+7816c24ff8907c9f24a9e35992a4d5f3cc9dbc7e v7-4-459
+d5eba03293a6193a1b462822800641b820252ce3 v7-4-460
+4eba2bdb26f2be61bfdb1f635c0ed65f4bc35b0b v7-4-461
+c0d93d67572b2d4161d0c5a5ab09477d6447ff49 v7-4-462
+6f80b9a773db0f3c69156f8768c8b6cfa4ad6785 v7-4-463
+74c65620c985f680eb1d7c1110f259cc37779ffa v7-4-464
+452e8b2a0ab39fb0cc037382cc4842a6d6b2a3f2 v7-4-465
+521c49b6de9d6352331dd8ff63286f6673014616 v7-4-466
+0a4efa3d20197cdf0bfe93080abc7cd197878e9a v7-4-467
+4f7f236d773d21e46ffa6c38d8df110d11413dca v7-4-468
+a6f5a4ac4d4666282179339abe696d7689f8681b v7-4-469
+9d5b8b015e5f32b84e0d74f21481b0cea2b84975 v7-4-470
+3005da486a71dc1171b3c8fe075701ea5e4b5668 v7-4-471
+af998690a8841d4df95cea0bed4246f2ba98e247 v7-4-472
+1cdd5804b538d578d71c9d85fddf8805cb200663 v7-4-473
+7f2472960aa114ee650fbac399b4561f1d43251b v7-4-474
+0446fa17bd95cdb37cd0c14ada32818b43577597 v7-4-475
+4c29b75cae193c039f44ad438f772f8af19d2bb3 v7-4-476
+f21a2f67bdbb7bb7c5c2352186757c3fd2471ce2 v7-4-477
+fcb898dea2bc8b6e89172cb48ef26c56cb79cfdd v7-4-478
+e0f2ed0efb49d1d01b978f8a7f0db5cc8813cb1b v7-4-479
+e3149e2b415260e7a3d8c9d51ee56d185e6bb1d7 v7-4-480
+15e88e3750e3b1458b0d38c2f16ed784e51a4f3b v7-4-481
+488bb7c4ace08fc93dd5405e7146cc82e32bebf1 v7-4-482
+3eb160c5b3a195855cbe21309e6b9b375de63803 v7-4-483
+76526e7100b0c61d9cfbe79edc855f6798363627 v7-4-484
+7844d92941fdc10653ff5a6925346a02bb7f5404 v7-4-485
+b8caf7045e3d838849cde86f3eb0142e50482276 v7-4-486
+1f9577e9ef1b22cf701b58d418a4ce00071405ed v7-4-487
+3ec6e0ef4a67cb6030466bcd4d5d9f2fdd4f70b0 v7-4-488
+31c78e59080674530e5a2d2c00c343a5cab76dd0 v7-4-489
+df92c2b2a1795c8b0a43f2faf3a50b4b4a359773 v7-4-490
+5f54e1995751392b4cfa48d8b49f9fcf195bb239 v7-4-491
+5e998fc610d5b23ea55ef64c8f5291522ff3b4a5 v7-4-492
+a0daa5feaccbbed4b8d6db9c18f76ebe116c8e37 v7-4-493
+85d8cde3b432ae627382e1f2222aa8368f5837b8 v7-4-494
+0079791cbbeaaad9ff4391097c2f7896114d6022 v7-4-495
+112c80234ce3815b2c7d1c27ad21aa885d2776f3 v7-4-496
+adfbffe1e642d8779872ced560c13f3e62a39819 v7-4-497
+24ee7a7a26b1ec8169bbb4656a99b3499e971b50 v7-4-498
+65e72747fecab7c43c72a1562e4fef6b530e2db7 v7-4-499
+fd4dc6581b0ee754af50afefcacc1e241a3f591c v7-4-500
+0ed561752653050472279f14ec75144844b42bf8 v7-4-501
+7b28dc1d756e11bd7e25a19ffe272ac605613a40 v7-4-502
+094a87e76155fcbb43f7070eb605c2944192a7ff v7-4-503
+edfa81ea17117e6db410db58cb2a26789aff50b5 v7-4-504
+9bc6ce142cc385bb3d516ac5c2429dbaa3b32886 v7-4-505
+79a667b879e70b81e21735997f5ce62372e37886 v7-4-506
+5b2ff413125bf62b31d34efe1c816ebc05d8d7c2 v7-4-507
+65df2fba429b6eba6b25e1fa9422342c73afc64c v7-4-508
+60659773c73bc34f16340dba6f96f02f4664c7e7 v7-4-509
+05850b74218baa3daa2f5a8c40e14d07e9371825 v7-4-510
+7623d953d3bc2973e7a40f5a28c8f2d7d16f7891 v7-4-511
+9f9058aeba0d41d264c1ec1ef6ee4cee5aaa8ab6 v7-4-512
+6ad9facba57daad4c68b8d1cb3a8efe12d6ae4a9 v7-4-513
+e6c5ff35500d907cad9bfa1f6babdc08a4a90aa0 v7-4-514
+387e636805243f4ade8da63fa7c115dec64aa56e v7-4-515
+81c9b19ee0fb867a8364f73bdcc865676220cb0b v7-4-516
+93560d4bca68e9086539c273c4e3f7e792fc1739 v7-4-517
+383cb9ddb56115f95933c5b994e0cec64ee578a5 v7-4-518
+27a36d1013a6dcf699ea9b2ade80d74329257dbd v7-4-519
+392dad030b8dd123f95a2e3624727607f542b4ed v7-4-520
+39274bfbfba5ead4d25f5abc41c0692b27e60473 v7-4-521
+870480df8275c1647530a23cbf778d888e1dc824 v7-4-522
+9c9c70625444b29324a1e446eb23bb0c73547cab v7-4-523
+762ab69c2d138af49de407022cb7e363024f6a16 v7-4-524
+2587209317b75d073c352c61f1e6cd9f8c26d7f5 v7-4-525
+230b52b9d35ec12f6a83368b3479dfb85158bcf9 v7-4-526
+2bb019eb60ca1d16e62e95bef16475756965022f v7-4-527
+5f49ac8426dfddcc6725fae872b642976e468c8a v7-4-528
+72d5a533ec87c13e87e80273a1817b5ba19d313b v7-4-529
+5a76e36f07b160b44b4f4e637decbc914a243e6c v7-4-530
+2c0cddd0df8c8ca0c08027e7866f697ffd20d6fb v7-4-531
+7f48abe500e13554d14f5efae736da871a89ebae v7-4-532
+18953e121be6993e8e87a7d6fd49321ecfc2dcab v7-4-533
+ee28ddfc7b7c66b7c2a87ed95dd1d4cae7902a75 v7-4-534
+83c5fd1b55bc6b2b49b4653cc98985b8dd3fc728 v7-4-535
+d51d47bd77c2f042f9893d9c528a5f2fe75eb872 v7-4-536
+01c668384bcc7fd0f8572a8de2dfc3b2ead7eff0 v7-4-537
+3421b24e419c935f3914a4bf7eb6d3b1de3d618f v7-4-538
+77fe94082f5396c2e40f732b30c9d76984969694 v7-4-539
+93aca8cdd7b8cc1d9e921e243c7c2b6c7fd5f730 v7-4-540
+9fbb9c60ab41765a0d9f02b0b6d48cabe7270f0e v7-4-541
+de877dab1c3163a95ac8e7d3d6c3083a64e3c093 v7-4-542
+f673842874b6aa9fdbf3f3d9fafc67fe4debcbf6 v7-4-543
+89143424f604cd610f7e709ac683dc28a473e078 v7-4-544
+d2239abd3edb1e3672916c15ea8df6a01d1b86c6 v7-4-545
+84190359b9799b0ecb4d9e8e421471e14f659616 v7-4-546
+19726451aabea7e3640c56703846991c35e59e98 v7-4-547
+26a20ce3532c5e3f47f12facc28a5477fedc9e31 v7-4-548
+1fd9f1d43660f9645d8dabfd14131371aa2f529f v7-4-549
+7cda721eadb04f555a912b220c9047f504480bc6 v7-4-550
+eb0fb921e197c7b1294e1142479c982d1770eaa0 v7-4-551
+c8d6dbdd11563d39c42f16a80f9c74bc68155f7a v7-4-552
+e13f8073c9f9b8f2e80f32cf0c13073304a3f967 v7-4-553
+7e4c22ecc679455fdf3e1eec6681d13d998bebe2 v7-4-554
+c124393788693271b446ba24b55dca407e765bbe v7-4-555
+a35752526cd050f35306bac3dc04ac4a34a9f309 v7-4-556
+fcd5a3207100a1f75d96ead301249c60b4f23d79 v7-4-557
+48111d5fd8a8b133b32fa92137a56ae910915370 v7-4-558
+29f5cfca338897412e3a7c819085c1fe36da2135 v7-4-559
+86aacd619ac0ab9b6b6519cf132367b744adf8f0 v7-4-560
+82c6a3bddb23c7343fefc271b33960a20506ead5 v7-4-561
+b5df99582638f6f6cad794b7049453d7ff2c70b2 v7-4-562
+9dc52b404c1b3f32d36df2841c4c8eddea6e4407 v7-4-563
+9657929ee56251b52885cd0660941b0aab2af3ba v7-4-564
+22f95a018b13dc9d8a3246d990a1ea0b5b3a264d v7-4-565
+a88d4dc02bf438ff9e6ee119be8188e342ea459e v7-4-566
+0b245c8dbd19755e08b5248110a537a74ddb92c4 v7-4-567
+747cbac7047bf8d003ff0672b25b60e0236fdb1b v7-4-568
+ccb6962585f1ea5e7f872d79e59565e7a95234db v7-4-569
+816c584ff1740cd118d5a35fbea98ed28ed2e2e2 v7-4-570
+97b2ff29ae3a213b5c72bd8ea3aa2442ef355e08 v7-4-571
+cba15023c40371ed51ee0ed50fbdf23d6860f0ba v7-4-572
+8cfbc34ae4aa2b91b5b012b2e8dfe86327b449c9 v7-4-573
+45ff9dd354eaff958c0ba646134e1f5cd6e9186f v7-4-574
+fe0f33ac63af3c16a9920fe08bd3582aa0f02f50 v7-4-575
+749fc929da45d07efc5352dd8a0c00f8ed9f2163 v7-4-576
+bcf9d3a6007fff06d0521339f93dc870e5231eaa v7-4-577
+b7b3afcae90e5b8e9f57ec3b172fed14f6912579 v7-4-578
+134a7d55f9fa170c8c4591328eb550e70b756616 v7-4-579
+a5a6f1467b1ea73697b3265d8f12805bd998c81e v7-4-580
+e1874a4524f8c97efed78e215fd5ff91f3569351 v7-4-581
+dfd593d81818468ad60cad4fc66c561299f8d969 v7-4-582
+f2978794e801bfe8a587865492302cc0a16783cc v7-4-583
+79b3d83592c5ad63ce0c8d276d15f570e95dd941 v7-4-584
+1d3139ae6ce67d69ce8bc221bfc67dc1b47e95d9 v7-4-585
+667cb2eb17a52d9ac28a1b6f686935814e769ecd v7-4-586
+70793fedd25a509568abbd4026565675e830b1ca v7-4-587
+a03e143b93587cf29c91121acdf66f6e5dc6e470 v7-4-588
+8ff2d1b611bfeb17b594262cbf9313f819b4483a v7-4-589
+5b8d26b85437ffa91cd586fa138aba80bba897a9 v7-4-590
+7b8e3be930f39af3cdc1fe969a6de16f2d91e5d2 v7-4-591
+005a6b65086666ed56531e4c8a531a3ee0cea638 v7-4-592
+bdc8e71633e45ebe5f1b59e4328fcf22a5866cb7 v7-4-593
+f9d02ce2f745f75003ff570b2a596c755ccc86ba v7-4-594
+d83436d119871584ddb012ecf0aa4d01030f65ee v7-4-595
+6da912e32896c57227a0f297aa1d3312a653cf0a v7-4-596
+c124a8f34ed1cf510d384b384db6f34be5d61a3e v7-4-597
+b01ca71f93b293ba93489bc2320c12caf61bf289 v7-4-598
+1ef8ce97fc40b59d7218d7300685d40df63a407c v7-4-599
+436d6c9e57f2f6def73e86891cbf72a0328aa9bd v7-4-600
+2561531decf15c1a02f62a1b96ff778e12a5dcbc v7-4-601
+4e31d9f7c896a346b2346fc4ff005b8b255172c9 v7-4-602
+0c8738124a7b9d6d1d3e18124ad97310e9618c92 v7-4-603
+f625b6302d048df7d9f9e738b773f91dd4bbd58e v7-4-604
+c1ed973fb58faa650dcd4d25a98c669edb8ca0d4 v7-4-605
+22f164bd7e8ea7de1e4c2a41020dde971112b862 v7-4-606
+52b89a52ffd4f2a925b42be1aa8041bc0c0dff31 v7-4-607
+6b86d256fd3360a5a0a8f89c3efeda4e961153c0 v7-4-608

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 <[email protected]>
-" 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)