Snapshot 73

Merge branch 'vim'
Conflicts: runtime/syntax/vim.vim src/structs.h
2026-05-28 00:21:57 +02:00 · 2014-04-21 16:23:59 +02:00 · 2014-04-20 10:22:02 +02:00 · 2014-04-12 13:12:24 +02:00 · 2014-04-12 13:12:24 +02:00 · 2014-04-12 12:26:37 +02:00
480 changed files with 29482 additions and 27423 deletions
@@ -38,6 +38,18 @@ 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

@@ -48,6 +60,7 @@ src/xxd/xxd.dSYM
 *.swp
 *~
 *.pyc
+*.log
 src/po/vim.pot

 # Generated by "make test"
@@ -2661,3 +2661,323 @@ f72d49c406c48293e30d774303493e4c8d120bfb v7-4a-004
 c624928fbc49408ab932e5c79f5f79e53327d700 v7-4a-007
 b3bd43ef012d975cafb7b2a4c41fb78486ee4cc0 v7-4a-008
 467efeee8f9e2060891bc718e6aeffaf79eab43b v7-4a-009
+a4e08386a6aa29c5e58302f1650fa2ad3f03b76b v7-4a-010
+ce587b26b8d6bec140af41712bb99c4c73c3bf99 v7-4a-011
+fca6ba0d2d66d38da8ae023e73944a69662c0d66 v7-4a-012
+42d592dbbec3706429e3f3f75c9c394db6b9c1bd v7-4a-013
+08eb573821869727e5951e6586207dfbe5fd982c v7-4a-014
+7a1b782ec64ac55052755ed72ff023093b246d96 v7-4a-015
+4104bed69ea561a105c3db590aa6c75be2a24836 v7-4a-016
+4cbff53717d4920cb64d417c7a603b45519138f1 v7-4a-017
+c6dd0c545e5ca25e0b45fc1dbd7d1cb20642830e v7-4a-018
+bea5eb942011c09a6a8805e6b21079375462a710 v7-4a-019
+fa76be660fa914de79e3856caea8261cc7ab6c5b v7-4a-020
+fc6f4a653265f9e6b3dfa82faf067329dd5044a2 v7-4a-021
+c28202427d71b4460122754884bb548f084c3d7a v7-4a-022
+45b2278e6f461689d068f138428e9f3fdb01615c v7-4a-023
+ba9a11fe25637103e1a77fefbbaed4ac2ff182f9 v7-4a-024
+1b89e3f916c59fbdfdbd31e4d8af8b22274275b2 v7-4a-025
+b3ff17862b4c9d06411bd3c854cfceb77d5b97b6 v7-4a-026
+8edba3805d787f50b51d7fd59899c5361c09a348 v7-4a-027
+7aca84c0cd37ab4eceab8897e0297e2e318b8fff v7-4a-028
+2b58913e19a5a40d169f2aa1ef9530a78c375d2e v7-4a-029
+bc4fb031746594e4e84b36e64389e78454617a86 v7-4a-030
+839ebe7c1b2fb8150714fc48ec597d2e1f1c7557 v7-4a-031
+2741b46e96bfe6c06a5e9704bcad649655f7b50f v7-4a-032
+fa024ce48542356206bf86bdc9286ecf0510ad49 v7-4a-033
+947edb6335d1e196c27e2e7e0e0a5ed8f6b78498 v7-4a-034
+4ceacc1b00548c0b21c0dc2628608515899df721 v7-4a-035
+9982ec574beb1866536f0e8a0ace3073faa3bb97 v7-4a-036
+91d478da863e0779c482c790cc96b14188f3ecaf v7-4a-037
+8f983df0299fb4f1c7359eb3b844ee93e8f7e8fb v7-4a-038
+a08fa2919f2b39be0416109d87a42fbb5880ac76 v7-4a-039
+1261caf9bc5193d304140647c08ca5b52120ce52 v7-4a-040
+74d2f3188cd0aaa0d3d7cd3df001d88b04f77f5c v7-4a-041
+1899acc5aebd40f625b9fed7bc4c1b5f67e5bc3f v7-4a-042
+6fa64615c8d38ecf464702b102538c09fe250813 v7-4a-043
+647596ab1ae2f4b36bfc20293adf4b3a43372818 v7-4a-044
+da95a7f1d5a8413ae719188cec5b706b99db4a91 v7-4a-045
+f0361e297d9ceb533a17530647b4482c3990df3c v7-4a-046
+8c6615a30951fb9f2d2b218e55626f5dfa3fa24e v7-4a-047
+09c88160095d98a0b1403e9230c76e8adbb75d59 v7-4b-000
+47a09a572ea670d0498983eaa6ded5ab4f12fd15 v7-4b-001
+2e63b6c763f7af2ef11f751d3047847652dddfe0 v7-4b-002
+ea876fe914833a69018c54d6927dbbdb42ce6ecc v7-4b-003
+3c6e2b89875f39c8417021aa369695ec1ba762df v7-4b-004
+e63e4b4be9236c2d811b5ec7bdd79e387ec8bac9 v7-4b-005
+6b7ab6a4f31a54bceb4e7d6f0f9404b5a37bdad3 v7-4b-006
+b882d4b14e00af23444fd630aae3ac32214dd097 v7-4b-007
+3059c799fcd997ea60a63ed10a2a09d73e3ed3cf v7-4b-008
+cd971e951b0626c253059d8e25859032560920a6 v7-4b-009
+585b623a1aa3baea87a1584e6064612b2183d312 v7-4b-010
+7d1f89b2710305a00e6adac35a1fa6edd47982ba v7-4b-011
+25f67b62afd8c58b6c661961cc762f00ee89e562 v7-4b-012
+1ed6fd19c36051da73f9987777002b331853f5ea v7-4b-013
+3ddec3d25bd178d4f90114bce9ce889f3889e6d2 v7-4b-014
+d96f16667cc48d89c380fae29d86286b20040d5b v7-4b-015
+ba37e955913e85700677b89a720c6e5fc8d23cc3 v7-4b-016
+8c42772f05438e9f06200bca731cf301097be8ea v7-4b-017
+7ed1ec814dafe8109a2f34302174267d31bbc924 v7-4b-018
+74a211a0d3a3135dd67329cd981f5100f5e4d064 v7-4b-019
+46cf49cc9289920704999a971f397eee1efdb3fc v7-4b-020
+059c8a4b103f6971276435127c7ad970a81b0b2c v7-4b-021
+d5d6b78cff090e87d52924179e44131b5ba7436d v7-4b-022
+359743c1f59af353454dd80a26d9f8c20ae6ee8e v7-4
+3e9107b86b68d83bfa94e43afffbf17623afe55e v7-4-001
+e29f11399ccec9215cc8cfab1f9307dea0567d70 v7-4-002
+560a6a2329503d483db019a88cacc3307e5c30b7 v7-4-003
+f6247eaf4e1d556f782321890d725663f74babe6 v7-4-004
+3640cf4c0d4b6e5687bb7a31678fab70c88ed94b v7-4-005
+2374a05efe20287d55bd824689a41becc7662505 v7-4-006
+4fe1dfc7014e57b4beb5a01c9e94357265d19a92 v7-4-007
+b04bdb2c5fce70a278d26c477debb65a388da0ca v7-4-008
+8b5d80861c5e0403ea9f54ddddce2752a463c8a5 v7-4-009
+bb358cc41d920983629ace62bcf26decbf06cab4 v7-4-010
+54e66395831c1a58b4a9804e7884e505842157e8 v7-4-011
+8e28c23e482c5b3c8296d8022271822886793456 v7-4-012
+07737d3aa81725672796cbc9a010d63414ab6fea v7-4-013
+9801d06e7b4ccdcd02cf40bee34eaaada0ca0409 v7-4-014
+a7478f9f2551e95bff138cd658f7a86ced804ab1 v7-4-015
+8d5cd0ec3e7183a289f9bac41d3981307cdc1fac v7-4-016
+c47c8cd5fe5c014c141d9fb3fa8935b268436a4e v7-4-017
+460d5be9395ef3e05f4b1397ea98a5b54d825fc5 v7-4-018
+d5eb32dc231cd870c562e7b0be96fa994b505d9f v7-4-019
+c1ae5baa41f47bbf96be81e0158707a88af48b34 v7-4-020
+c514693882b9f1c7be2e76a0307926df799da3ea v7-4-021
+965044860b7f4884657fcaa042853238c7b13e69 v7-4-022
+09361f13580b075b6e87707c47165e8d45ee98a5 v7-4-023
+00d61a47df66cad21b80c6a683164e8d19180045 v7-4-024
+9085d32d7424963013650805452ede5dad22211c v7-4-025
+6bbb2ae990c92f6858b86c047e16dd12183d4273 v7-4-026
+73cc7272de5e0173b9578f715c4794a8b3803bce v7-4-027
+923738744a60e5e0bd2d9990758a2169106807ca v7-4-028
+2d3fbc68b3a84ad2bf4d58c77244043328e3fb81 v7-4-029
+0978e99043d2a9faedb1a3bad75b59121c270bde v7-4-030
+b21b5dcdca2197fc86b9bde77bd6777f0e2d5175 v7-4-031
+71e92a1cb37db719d6406858a50ca3bdfc9881fb v7-4-032
+91f6a28e010d49ae73c13c85dbb8b14c9e5edb36 v7-4-033
+22dfcd1494e4f7ea8ddc96e8dd895482e77e3b5a v7-4-034
+5481f188dcbb7143596f2d470c7d674bf36efe64 v7-4-035
+90e2f0729a0df249931a2dbe5f4310ba6c91cab4 v7-4-036
+c3d379c2a115b957d82eaa5f2215b688f36a22da v7-4-037
+6daa78b6b99a2ec07d20336db47c9f8165098062 v7-4-038
+4dfba3df303c51fe31efd1255338e9fcbedc5401 v7-4-039
+8336fd924e057d8c797043430325379d9a3ae37b v7-4-040
+408f2a1a953feef25a2c5c96352c82674655e797 v7-4-041
+70915ede509a737ac78c421f43c4447c9682ba41 v7-4-042
+6d11572e2c8b1117b90adf588ff1467b185c1b57 v7-4-043
+c0e3990aed3f179ef006e6de1458e9818c9ab896 v7-4-044
+8ced827b2e8ba49f9ae0da2033670fee83e7b55b v7-4-045
+68056d414f09fccb39219d7fde77fa06769ffa3b v7-4-046
+c21b2f52f1dd003d860e3b574602ed3fdc2b4f1c v7-4-047
+31c9acfeda8f1b84d51a480c1efbb56f384e76b1 v7-4-048
+15c1b8a20da6d650ee3ed0e73c2e3832093b60dd v7-4-049
+eb33cadafcabfc9cb3fc0741e169e84cafec11f8 v7-4-050
+e7a2f217a385e6aebfddc4d29182924ac017d262 v7-4-051
+b9c1c1f4cda9b82a2e703feec441d865b4722d56 v7-4-052
+733193bf24c3a80883c60964922c7cdc83662eb2 v7-4-053
+7b760cda2bbf086ba975fd5a4bdc6190a0f08caf v7-4-054
+38a755adc58063894c6695d702cc37f4910bad14 v7-4-055
+8d83c219fc7b2ec8685ab9e0dd7d3067b7f9d1e9 v7-4-056
+3109053ce4e3d17ca6ecab06c0ea0f38581d2f41 v7-4-057
+fa8447ec582378ca8d2c0245bd4ac195876abf2b v7-4-058
+2a72805a3038285c35f47dc0327a57cdabbdf09d v7-4-059
+46ca8fcee5257cc036ac928d91b2a490cf47a956 v7-4-060
+739074bdceb85d16b9e70791d91a59c2b846ed8d v7-4-061
+d59a0b8e5584c6e093990abb1b1e640aff7620bd v7-4-062
+9cedb4dfd4c830783ac65128dbbb118da2e3c638 v7-4-063
+d062239654688774d38e60ac42cec8ae1fd0f14b v7-4-064
+7f341db39d5bee0a9259a14a65e19bc9efa65417 v7-4-065
+38b948f534e4646bf879cb4d30151474e093d139 v7-4-066
+86bf09a1b6d0275131caf7ffc51598608e7242de v7-4-067
+efa40be729c2c94c1d8d0bf95000c4a7d2976dbc v7-4-068
+878ed73c70706d68bc7175343e4deb24b11963c2 v7-4-069
+e6f3f66028d448bb49ee2336cee60b13ced7cea9 v7-4-070
+faf7e86203b5d5c98bdd30dd92524e5062b2412a v7-4-071
+d563839a9be0be6e85d93e366b4f7ffe705d8e3b v7-4-072
+d0595545e98a3b7b6fe1a96ab0106d8afd63c31e v7-4-073
+9818311eeca0d76641879e95143f314e7295cc26 v7-4-074
+829aa8c8449d85d0de3a29ac8ce647ec706efd02 v7-4-075
+8f0c264db1e76a65499f0846d961907d7ecade9e v7-4-076
+53bc55e58fefee7a83a7a56fc7f05e0a4d36dd47 v7-4-077
+5c3064feddd7c9bfef18d8067172335f101122c5 v7-4-078
+6ae816249627b34aee618b49c4169b7ca1f54ff3 v7-4-079
+c5166fa1046462d73891f0b395d6619e7ce96c82 v7-4-080
+42927712b3d997bdba9d8ff5a1199fe4652c5899 v7-4-081
+9c777e2c702487bd0b5c48a22edc17c98b87e070 v7-4-082
+6367a766027d3b60caff43c35d8d3597ad90f6c6 v7-4-083
+a56f60cf683455bea96daf077458158041e4d6ba v7-4-084
+70c3289803b3129f34ffc327b113dcf152222a56 v7-4-085
+60a5b7b82016da631dd7acc6121913d02c5677f8 v7-4-086
+9334c994be7bb5e16a1f9c6b67e1c4342a6a386c v7-4-087
+853a76c7fdedefbc1dfdc2a4896d37a3806500e2 v7-4-088
+6707c44cec61d76026d5dcdd6573fb41cb89d0bd v7-4-089
+31217cc48e7d8c9aca703688d3d04d8edbc85bba v7-4-090
+9502d1caf90bf56f0125c99b7d17ba70944ebd85 v7-4-091
+1b4cb2c6b285265da4ffbe242af35a73e1b118e6 v7-4-092
+33f3e277ceab43179c74093f68196bd370199dbc v7-4-093
+68b5f8abca93dd035ba180aa673a5bbf035b89db v7-4-094
+acbe5414cb7f302f548bc1cbdc1ddb029dbf9094 v7-4-095
+645358801356c7b1c53a1d3b1543781a669a7733 v7-4-096
+93c8296281dd64e513d52db9f745965926df5cab v7-4-097
+79a8bac614c0c565617b404764f28675687ad442 v7-4-098
+8451f643a13eaf22e35a45e6bdd47c8d5b24c222 v7-4-099
+5ad60cd88339c6217fbea8cf4f92dae04ac1c71d v7-4-100
+ec5d11403c1952b2ed192f28afb6261d0867bb20 v7-4-101
+9417f4de27a2a6acfa6b1660ac6ef2b5692e4554 v7-4-102
+4db151014f93b7512919e452e6b3f4184758db7b v7-4-103
+dd7d1a86b311c11e9c03b7ca95c7b62206bbc7ab v7-4-104
+eed95874f30e9d9dad577f2361f2dfed93c5db4d v7-4-105
+de9a01851ebd1ce1d225b40c182b6f1e105863a7 v7-4-106
+064e2a080e2e158177acc017c318bc953fb7535b v7-4-107
+fa31c5b82424373885d2fa55b4f8531ac21baacd v7-4-108
+1cdf517067743dc33ebb9c7af8844abd9d9c7863 v7-4-109
+6e54d1b3408ca745341b0b219c588c265fa52494 v7-4-110
+3fbda56bb2008e2459951f3ad0258ff0500ba07c v7-4-111
+af8217e4ed7e28b797c628f067ebfd4433c07326 v7-4-112
+0e21e2a38ec6df5c4fe37d639906f56f9f445b96 v7-4-113
+6db758f82227989426560c19fdd234b154b54419 v7-4-114
+e35c69ad482370b2685bf1360a63fb27ce8b3819 v7-4-115
+40aff213baff00d43ea8c1b6a9734ccad63a3921 v7-4-116
+805ad8488dc88a575b841589f36c278aaead4e52 v7-4-117
+62c720661f81c17348636956c1158639d59e1e9f v7-4-118
+2f99966971b0556bc302ec809712f5ba3f030028 v7-4-119
+ca0e43bbf8f9e409130d5d1ce29621edbcdff92a v7-4-120
+4bf53c1ef37a5023e06f3c6b4f1c24857b4f52a6 v7-4-121
+270c62fe685ae943de64e1a4ab295dae6f4ccabe v7-4-122
+32e50f85d2c7a56c600a2c36107e56fa9f2952cb v7-4-123
+9faba192ea90a32ee137aa42f5027b098931ddb2 v7-4-124
+45ef9d2096e82d6a56a58606b6811620a61cb1ba v7-4-125
+b14554844756422a39c72e62b8c2391c2d5a2e17 v7-4-126
+6f5a7d3943007afc6bc03c445380776e18787f0c v7-4-127
+4b92012f6b18f56664c268200fb54f1316495dc5 v7-4-128
+1e28c0fad344549665c60c62374e6f511e5aec76 v7-4-129
+cf722c09236098ae585840d62eca68dbf8065247 v7-4-130
+4b23119cb58473ab70cf1a1204d4d3fad83881ec v7-4-131
+1b09d6792520cbe1c94c20f6c833ad57316e75bb v7-4-132
+6a28a9cf51537b81da7e9ec3f70fea55e393b345 v7-4-133
+0defb460a0ebbc954b0f22267cb06e9d210be43a v7-4-134
+1aeb7f4d6527369cf5f9101813ce8f10caf7a869 v7-4-135
+3881cd916014605875de128226b83a24d18afe46 v7-4-136
+6fdb1d6646b6b256623edb05f9dd770eeacaeb05 v7-4-137
+6eb60041548ce42748cd8d7d49bdbf9dd164c967 v7-4-138
+c8c80c9d2e2237fedeadfb1c6856c53c7a5e90d2 v7-4-139
+505cf1943dc238c2383dcbc37a93fbb136e1f08b v7-4-140
+2ca470c6096e3ec7cbbedeb1d0281056b088812b v7-4-141
+735b70faac4a54ca9d8ebc2303ba28d5d18017e2 v7-4-142
+d11f223f4c753889fa8f974f295c2a0a451c653c v7-4-143
+bcf25cc08236c2adc27a4d7d556e11e8ea6ddce2 v7-4-144
+1098b7b6e147cdd324ac665340540922c2cdceb3 v7-4-145
+ec93f50f1d93c4c279606117a9f3eb37301b051a v7-4-146
+d289f2167d702c87493d1934db863df29676e261 v7-4-147
+8507bf8874d816a79411bc74df71fa58b557b71d v7-4-148
+b43363a7b4c71a7a4e20dc21f4906f4595785983 v7-4-149
+15960ebc2ee8539a1f15f660d43df1a502c34829 v7-4-150
+ec02e1474bc2bbfd73349e7fedf62ae45f941ad9 v7-4-151
+2ace11abcfb59f6e88c3a40aa1d849d335cfd993 v7-4-152
+30e300c0b2c1c069d953afb258dba39c50772463 v7-4-153
+71837ace77dfdd6c01e0a334314a7c6c713a095c v7-4-154
+fa53233519c693591ce60f9270cf259c07d6cc26 v7-4-155
+05a5cb0d6b37eb7806eb902a72d8b00dde48bc1c v7-4-156
+be61f315eafe5cbadbd00bf7275e004fe09779db v7-4-157
+d59544f3022ba0a35af174d1085a321de6d3b9b4 v7-4-158
+a95a151402be5155cd89f8758e2e09ca95473ad1 v7-4-159
+f29febf858be9c7df896cc86ea89c3da8823b4fb v7-4-160
+91f3908748c29b0e8e759ac4cdafc95e536eab9a v7-4-161
+477665b4105fa80e3655981790e55fc9babfeed5 v7-4-162
+7db84aadd37aaf9d59f8f15dd6783a4e28dcb63c v7-4-163
+a01819fb6e2b5c270dac492ab2fe923ea9301651 v7-4-164
+c82339d8fdae0d43d51cde5216c979a5c9415bc4 v7-4-165
+5d03c374712128077ac4c342aad02120ed98df70 v7-4-166
+22387c8eec43ea8b1b704cad49c8f7187e2fd579 v7-4-167
+e61a2b709f693eea9108d475b9bab5ed10ac675d v7-4-168
+4e3a9dd25d428e7c08ed401afc244972e27e08e6 v7-4-169
+8122eab8fcdbbdaac62dfbf7c6458cb3e6f46b04 v7-4-170
+beb037a6c2708f539d50840637f70eed0811d93c v7-4-171
+391e10afccf6879dcfab8b28cb1587a13eb835c0 v7-4-172
+233ad7b960d0fbeb224b383918113b25c74ebe35 v7-4-173
+f2c8d86c460d75fec17a0527a2fe93ac7220693e v7-4-174
+6b69d8dde19e32909f4ee3a6337e6a2ecfbb6f72 v7-4-175
+ae228baaec2c5eda4cd948382c2bab498d1a34cc v7-4-176
+df3b0b70d8c1d29817597f45d19bb72755f86bd1 v7-4-177
+647e6bb15aa3f864eaf447fe77e3e3ae7e37b134 v7-4-178
+d1c8c1d6403485ff0135f0cf5c1ef07272a07173 v7-4-179
+b1b8b097539a001043d1f0aac4663d6ee358dee8 v7-4-180
+cb5683bcde03796baa7e845fd9a2fcaec3383538 v7-4-181
+708a6a5905217736a2a231e36ced82f9535c4954 v7-4-182
+1e2bfe4f3e903110f27cb6231f6642e721808837 v7-4-183
+9ac2fc63501d3eff92446c03b2822b30b169db5a v7-4-184
+b06e58f8dd3037f7f17145968d08432423ac8665 v7-4-185
+4d12112c5efae071aecbeed1a7196f18950457b3 v7-4-186
+a1c07956171a133583df42627d3498f935e59988 v7-4-187
+136f05449f29388e9023f7934d6344bf4ca61d0f v7-4-188
+0a9990bbd94a7dbdf20ca3f897cdf364c356d228 v7-4-189
+6050f52d7cd8d6f79ed5ee8ef3efff332aca4932 v7-4-190
+40f18a1c1592c8b4047f6f2a413557f48a99c55f v7-4-191
+04c4ef8c0a1b757494500e46400552b135135e94 v7-4-192
+a8650e2a0b5a5936f7d503429180df47df2aa775 v7-4-193
+767103b5bcb05171fc1be0d6f480e0aa39aff731 v7-4-194
+c2e88a40d530b7999cd29218555515bcd282d661 v7-4-195
+1ed6acdbfef55e6e80aea55c8bc52d05f8458bbd v7-4-196
+47a673b20e493db91844999f74aa3724808ac624 v7-4-197
+705f398ce6f58016fae80c945a570721fc989117 v7-4-198
+54b1a90c937380195fad6a52408aa3b4eed6d8d1 v7-4-199
+0559091e6f09b5b96619513639ac14578a019612 v7-4-200
+06e5f65c34d8136c3a9d2219429b7eca35cb3a21 v7-4-201
+22d7af9ff3e5e2b93fdbe8603df2f15155a5976b v7-4-202
+fb24b025c7cf07db79a559a3091db42e02c1af86 v7-4-203
+f5120cbf16b9a9c6e0fbb599a6524e05ecf11393 v7-4-204
+0ace3a24c2a0153f0aaf9b619d3958e7f486705f v7-4-205
+7e826028d3999b6125b4741d45b22a2d0a520679 v7-4-206
+2aa909427e44cd3aac7def024b66e41d0c9d0e0d v7-4-207
+9b5541e276aa56fd72c3bbba85a17ef023c54ba8 v7-4-208
+bb402c49379de97fcd475fbbbbdc5ed41e5dff07 v7-4-209
+420fd9cb86d51a92c4307a746557e81914c6d6c4 v7-4-210
+e90bef2240c8d187da6e8d8fa5007ec5afc12284 v7-4-211
+50dbef5e774af6a998d1798569566429c38378b1 v7-4-212
+e25a04c1c515e6eb32197291472f89bcadfabf89 v7-4-213
+fe02fdfbdec077d0dc501bca0c65c51e56e1bd11 v7-4-214
+f069a3a0f84451aa498c6c22d8f922d1e695e96d v7-4-215
+bf1775553d3bf561e289bbf367d014915d09eaad v7-4-216
+2f225a17c26b26eab87cfb89142fc0f95726ee92 v7-4-217
+ddc3f32a4b2191f829206322d46f0e9c7e365e22 v7-4-218
+37af1e6e91bb1e8ceb89d3ba1c49a04ffd889880 v7-4-219
+1e272e318daaba51ec932be83a2481987a133429 v7-4-220
+a548aae15b3a27a56d814900049785c29c01a37a v7-4-221
+9123b4d3ef05c7434b6f6cd011b63f63a9a4a539 v7-4-222
+4b78922d557c324de6b6a75515fb658235fa782c v7-4-223
+092b8f61021b91024b127de3983d1afb74b64996 v7-4-224
+eeb150c07647b3691d2696a3a4cdb96f6db5a63e v7-4-225
+b650f2db8f9604124c0ddfb14af0c04bd4ae0580 v7-4-226
+b0a9df477096e4abe938f998476e84e77db42e0b v7-4-227
+3ee5808a293c7436e34a696a09ed29ce38750d9a v7-4-228
+839cca5ec18d560e3714065e54ed38b6e812aaf7 v7-4-229
+57ecd7a8c0f052296b41b916eb1ae7f2a9a48b27 v7-4-230
+0a295a3c9e473512ad3b006a0fb752ad43d19094 v7-4-231
+845608965bd9d0b2755997a7be812746885ff105 v7-4-232
+22a1d5762ba3a75984e89dcc47a65498f63a6c2c v7-4-233
+d2286df8719d6e99c743e3bf6ac14d1f9debc84d v7-4-234
+5ab2946f7ce560985830fbc3c453bb0f7a01f385 v7-4-235
+a44087db72386d080e9da870d751daf498004be8 v7-4-236
+71b165a378ad580818f6d497ecf0f8ad054a9683 v7-4-237
+410ef4f1a3d2f4a6ecad9aaa87dae645d1578a19 v7-4-238
+98bfec9ea7608f312129475d4ca0ae6d1c6c232e v7-4-239
+8d1ba0a23588932d22ad37cbd87ae3bbd4bfeff8 v7-4-240
+a63d0cd691dc925283815d17d62f4e948d723a59 v7-4-241
+f084024c0ddbba46aabfafa2996c3f7d13080ab6 v7-4-242
+9f8fa56f1906f4f634cd602a7a2b4f8631faf526 v7-4-243
+da17c7de616e3829e4f59923ffa138a067928d9e v7-4-244
+80421d934ebde183ce545ab8d9eb3a4c2065c169 v7-4-245
+2cbac5608217cdce725a0f04d397d4466a3322fe v7-4-246
+76863b4b48a3684905527dcc688e5a8c4c5e23d9 v7-4-247
+e5f1f2ea0b4a4834791924880f78272ef52eb087 v7-4-248
+0b9a66ea49f435536745be0e0a6154be7b607249 v7-4-249
+a8f3f45896288bd7e0a27e0c28c3cc3457ccc507 v7-4-250
+29eb4c2a33ac701bfcd4d2e2bed7864eba876e0e v7-4-251
+a43a8262e1ceffc393625c53a1ffed9e6bcaba62 v7-4-252
+4901a36479f200b2e6700ad91c26911d92deb886 v7-4-253
+251acc686ca41e4bccb037ef44cd7b486774d580 v7-4-254
+5595506b985a198abae41ab0150ee50b8bf1686c v7-4-255
+afb542ea210cb9fc5fa8c5359bb4814370024b80 v7-4-256
+17903ded5e9a9d49ca73b324657b944f2954d4fd v7-4-257
+e8ffd1e6c8dc62c604d34e879791404bd15cab33 v7-4-258
@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...

-		Version 7.4a.  Also runs under UNIX, MSDOS and other systems.
-		vim74art.tgz  contains the documentation and syntax files.
-		vim74abin.tgz contains the binaries.
-		vim74asrc.tgz contains the sources.
+		Version 7.4.  Also runs under UNIX, MSDOS and other systems.
+		vim74rt.tgz  contains the documentation and syntax files.
+		vim74bin.tgz contains the binaries.
+		vim74src.tgz contains the sources.
 		Author: Bram Moolenaar et al.


@@ -80,10 +80,14 @@ SRC_ALL =	\
 		src/main.aap \
 		src/testdir/main.aap \
 		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/python2/*.py \
 		src/testdir/python3/*.py \
 		src/testdir/pythonx/*.py \
@@ -694,6 +698,7 @@ LANG_GEN = \
 		runtime/doc/*-fr.UTF-8.1 \
 		runtime/doc/*-it.1 \
 		runtime/doc/*-it.UTF-8.1 \
+		runtime/doc/*-ja.UTF-8.1 \
 		runtime/doc/*-pl.1 \
 		runtime/doc/*-pl.UTF-8.1 \
 		runtime/doc/*-ru.1 \
@@ -74,7 +74,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #    Before creating an archive first delete all backup files, *.orig, etc.

 MAJOR = 7
-MINOR = 4a
+MINOR = 4

 # Uncomment this line if the Win32s version is to be included.
 # DOSBIN_S =  dosbin_s
@@ -92,8 +92,6 @@ MINOR = 4a
 #   runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt.  For a
 #   minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def,
 #   src/gvim.exe.mnf.
-# - Adjust the date and other info in src/version.h.
-# - Correct included_patches[] in src/version.c.
 # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, MZscheme, Lua (if
 #   you can make it all work), Cscope and "huge" features.  Exclude workshop
 #   and SNiFF.
@@ -102,8 +100,14 @@ MINOR = 4a
 # - With these features: "make depend" (works best with gcc).
 # - If you have a lint program: "make lint" and check the output (ignore GTK
 #   warnings).
-# - Enable the efence library in "src/Makefile" and run "make test".  Disable
-#   Python and Ruby to avoid trouble with threads (efence is not threadsafe).
+# - If you have valgrind, enable it in src/testdir/Makefile and run "make
+#   test".  Enable EXITFREE, disable GUI, scheme and tcl to avoid false alarms.
+#   Check the valgrind output.
+# - If you have the efence library, enable it in "src/Makefile" and run "make
+#   test".  Disable Python and Ruby to avoid trouble with threads (efence is
+#   not threadsafe).
+# - Adjust the date and other info in src/version.h.
+# - Correct included_patches[] in src/version.c.
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
 # - Check for missing options in runtime/optwin.vim et al. (with check.vim).
 # - Do "make menu" to update the runtime/synmenu.vim file.
@@ -111,8 +115,8 @@ MINOR = 4a
 # - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
 #   ADDITIONS".
 # - In runtime/doc run "make" and "make html" to check for errors.
-# - Check if src/Makefile and src/feature.h don't contain any personal
-#   preferences or the GTK, Perl, etc. mentioned above.
+# - Check if src/Makefile, src/testdir/Makefile and src/feature.h don't contain
+#   any personal preferences or the changes mentioned above.
 # - Check file protections to be "644" for text and "755" for executables (run
 #   the "check" script).
 # - Check compiling on Amiga, MS-DOS and MS-Windows.
@@ -137,7 +141,7 @@ MINOR = 4a
 #   Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
 #   paths when necessary).
 #   For Windows 98/ME the 2003 version is required, but then the executable
-#   won't work on Windows 7 and 64 bit.
+#   won't work on Windows 7 and 64 bit systems.
 # - "nmake -f Make_mvc.mak"  (use the same path as for vcvars32.bat)
 # - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
 # - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
@@ -1,4 +1,4 @@
-README.txt for version 7.4a of Vim: Vi IMproved.
+README.txt for version 7.4 of Vim: Vi IMproved.


 WHAT IS VIM
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.4a of Vim: Vi IMproved.
+README_ami.txt for version 7.4 of Vim: Vi IMproved.

 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.4a of Vim: Vi IMproved.
+README_amibin.txt for version 7.4 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.4a of Vim: Vi IMproved.
+README_amisrc.txt for version 7.4 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
@@ -1,4 +1,4 @@
-README_bindos.txt for version 7.4a of Vim: Vi IMproved.
+README_bindos.txt for version 7.4 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.4a of Vim: Vi IMproved.
+README_dos.txt for version 7.4 of Vim: Vi IMproved.

 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_extra.txt for version 7.4a of Vim: Vi IMproved.
+README_extra.txt for version 7.4 of Vim: Vi IMproved.

 These extra files of Vim are for special purposes.  This README explains what
 the files are for.  For general information about Vim, see the "README.txt"
@@ -1,4 +1,4 @@
-README_mac.txt for version 7.4a of Vim: Vi IMproved.
+README_mac.txt for version 7.4 of Vim: Vi IMproved.

 This file explains the installation of MacVim.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_ole.txt for version 7.4a of Vim: Vi IMproved.
+README_ole.txt for version 7.4 of Vim: Vi IMproved.

 This archive contains gvim.exe with OLE interface and VisVim.
 This version of gvim.exe can also load a number of interface dynamically (you
@@ -1,4 +1,4 @@
-README_os2.txt for version 7.4a of Vim: Vi IMproved.
+README_os2.txt for version 7.4 of Vim: Vi IMproved.

 This file explains the installation of Vim on OS/2 systems.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_zOS.txt for version 7.4a of Vim: Vi IMproved.
+README_zOS.txt for version 7.4 of Vim: Vi IMproved.

 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_src.txt for version 7.4a of Vim: Vi IMproved.
+README_src.txt for version 7.4 of Vim: Vi IMproved.

 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).
@@ -1,4 +1,4 @@
-README_srcdos.txt for version 7.4a of Vim: Vi IMproved.
+README_srcdos.txt for version 7.4 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.4a of Vim: Vi IMproved.
+README_unix.txt for version 7.4 of Vim: Vi IMproved.

 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
@@ -1,4 +1,4 @@
-README_vms.txt for version 7.4a of Vim: Vi IMproved.
+README_vms.txt for version 7.4 of Vim: Vi IMproved.

 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.
@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.4a of Vim: Vi IMproved.
+README_w32s.txt for version 7.4 of Vim: Vi IMproved.

 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.
@@ -22,7 +22,7 @@
 !define HAVE_NLS

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

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

@@ -1,8 +1,8 @@
 " ---------------------------------------------------------------------
 " getscript.vim
 "  Author:	Charles E. Campbell
-"  Date:	Apr 17, 2013
-"  Version:	35
+"  Date:	Jan 21, 2014
+"  Version:	36
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
 "
@@ -15,7 +15,7 @@
 if exists("g:loaded_getscript")
 finish
 endif
-let g:loaded_getscript= "v35"
+let g:loaded_getscript= "v36"
 if &cp
 echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
 finish
@@ -208,8 +208,8 @@ fun! getscript#GetLatestVimScripts()
  let lastline    = line("$")
 "  call Decho("lastline#".lastline)
  let firstdir    = substitute(&rtp,',.*$','','')
-  let plugins     = split(globpath(firstdir,"plugin/*.vim"),'\n')
-  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/*.vim"),'\n')
+  let plugins     = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
+  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
  let foundscript = 0

  " this loop updates the GetLatestVimScripts.dat file
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		May 03, 2013
+" Date:		Aug 27, 2013
 " Maintainer:	Charles E Campbell <drchipNOSPAM at campbellfamily dot biz>
-" Version:	14a	ASTRO-ONLY
+" Version:	14
 " Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
  finish
 endif
-let g:loaded_netrwSettings = "v14a"
+let g:loaded_netrwSettings = "v14"
 if v:version < 700
 echohl WarningMsg
 echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -98,6 +98,11 @@ fun! netrwSettings#NetrwSettings()

  put = ''
  put ='+ Netrw Browser Control'
+  if exists("g:netrw_altfile")
+   put = 'let g:netrw_altfile   = '.g:netrw_altfile
+  else
+   put = 'let g:netrw_altfile   = 0'
+  endif
  put = 'let g:netrw_alto              = '.g:netrw_alto
  put = 'let g:netrw_altv              = '.g:netrw_altv
  put = 'let g:netrw_banner            = '.g:netrw_banner
@@ -0,0 +1,71 @@
+" 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_lines = add(escaped_lines, escaped)
+  endfor
+
+  return join(escaped_lines, ',')
+endfunction
@@ -36,6 +36,14 @@ Some attributes (e.g., bold) might be set in the defaults that you want
 removed in your color scheme.  Use something like "gui=NONE" to remove the
 attributes.

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

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

 hi clear

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

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


 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.4a.  Last change: 2013 Jun 15
+*autocmd.txt*   For Vim version 7.4.  Last change: 2014 Jan 23


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -304,6 +304,9 @@ Name			triggered by ~
 |InsertCharPre|		when a character was typed in Insert mode, before
 			inserting it

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

 |RemoteReply|		a reply from a server Vim was received
@@ -480,6 +483,12 @@ 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
@@ -553,6 +562,9 @@ 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.
@@ -731,7 +743,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
@@ -952,7 +964,8 @@ the autocommand is executed.  This is different from the command!

 							*file-pattern*
 The pattern is interpreted like mostly used in file names:
-	*	matches any sequence of characters
+	*	matches any sequence of characters; Unusual: includes path
+		separators
 	?	matches any single character
 	\?	matches a '?'
 	.	matches a '.'
@@ -961,6 +974,9 @@ The pattern is interpreted like mostly used in file names:
 	\,	matches a ','
 	{ }	like \( \) in a |pattern|
 	,	inside { }: like \| in a |pattern|
+	\}	literal }
+	\{	literal {
+	\\\{n,m\}  like \{n,m} in a |pattern|
 	\	special meaning like in a |pattern|
 	[ch]	matches 'c' or 'h'
 	[^ch]   match any character but 'c' and 'h'
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.4a.  Last change: 2013 Mar 19
+*change.txt*    For Vim version 7.4.  Last change: 2014 Feb 11


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

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

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

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

 ==============================================================================
 2. Delete and insert				*delete-insert* *replacing*
@@ -463,8 +478,8 @@ If the 'shiftround' option is on, the indent is rounded to a multiple of
 'shiftwidth'.

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

 When the 'expandtab' option is off (this is the default) Vim uses <Tab>s as
 much as possible to make the indent.  You can use ">><<" to replace an indent
@@ -812,7 +827,7 @@ either the first or second pattern in parentheses did not match, so either
 <

 Substitute with an expression			*sub-replace-expression*
-						*sub-replace-\=*
+						*sub-replace-\=* *s/\=*
 When the substitute string starts with "\=" the remainder is interpreted as an
 expression.  This does not work recursively: a |substitute()| function inside
 the expression cannot use "\=" for the substitute string.
@@ -1057,6 +1072,11 @@ another register.  E.g., yank the text to copy, Visually select the text to
 replace and use "0p .  You can repeat this as many times as you like, the
 unnamed register will be changed each time.

+When you use a blockwise Visual mode command and yank only a single line into
+a register, a paste on a visual selected area will paste that single line on
+each of the selected lines (thus replacing the blockwise selected region by a
+block of the pasted line).
+
 							*blockwise-register*
 If you use a blockwise Visual mode command to get the text into the register,
 the block of text will be inserted before ("P") or after ("p") the cursor
@@ -1114,6 +1134,8 @@ less than one line (the small delete register is used then).  An exception is
 made for the delete operator with these movement commands: |%|, |(|, |)|, |`|,
 |/|, |?|, |n|, |N|, |{| and |}|.  Register "1 is always used then (this is Vi
 compatible).  The "- register is used as well if the delete is within a line.
+Note that these characters may be mapped.  E.g. |%| is mapped by the matchit
+plugin.
   With each successive deletion or change, Vim shifts the previous contents
 of register 1 into register 2, 2 into 3, and so forth, losing the previous
 contents of register 9.
@@ -1628,7 +1650,7 @@ And a few warnings:
 7. Sorting text						*sorting*

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

 							*:sor* *:sort*
 :[range]sor[t][!] [i][u][r][n][x][o] [/{pattern}/]
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.4a.  Last change: 2013 Mar 16
+*cmdline.txt*   For Vim version 7.4.  Last change: 2014 Feb 23


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -356,6 +356,10 @@ terminals)
 		List the recent five entries from all histories: >
 			:history all -5,

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

@@ -754,6 +758,7 @@ characters have a special meaning.  These can also be used in the expression
 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_##*
@@ -819,8 +824,8 @@ Note: these are typed literally, they are not special keys!
 		   the start of the function.

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

 Examples, when the file name is "src/version.c", current dir
 "/home/mool/vim": >
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.4a.  Last change: 2012 Feb 11
+*debug.txt*     For Vim version 7.4.  Last change: 2012 Feb 11


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.4a.  Last change: 2005 Mar 29
+*debugger.txt*  For Vim version 7.4.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.4a.  Last change: 2013 Apr 27
+*develop.txt*   For Vim version 7.4.  Last change: 2014 Mar 27


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

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

 ==============================================================================
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.4a.  Last change: 2013 Jul 07
+*diff.txt*      For Vim version 7.4.  Last change: 2013 Sep 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -123,10 +123,14 @@ Since the option values are remembered with the buffer, you can edit another
 file for a moment and come back to the same file and be in diff mode again.

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

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

 The ":diffoff" command resets the relevant options to the values they had when
 using |:diffsplit|, |:diffpatch| , |:diffthis|. or starting Vim in diff mode.
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.4a.  Last change: 2011 Jan 15
+*digraph.txt*   For Vim version 7.4.  Last change: 2013 Dec 12


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

-	Equals			=	Cyrillic
+	Equals			=	Cyrillic (= used as second char) 
 	Asterisk		*	Greek
 	Percent sign		%	Greek/Cyrillic special
 	Plus			+	smalls: Arabic, capitals: Hebrew
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.4a.  Last change: 2013 Feb 07
+*editing.txt*   For Vim version 7.4.  Last change: 2013 Nov 25


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

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

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

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

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

-							*:edit!*
+							*:edit!* *discard*
 :e[dit]! [++opt] [+cmd]
 			Edit the current file always.  Discard any changes to
 			the current buffer.  This is useful if you want to
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.4a.  Last change: 2013 Jun 11
+*eval.txt*	For Vim version 7.4.  Last change: 2014 Apr 06


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -123,6 +123,7 @@ around the arguments, to invoke the function it refers to.  Example: >
 	:echo Fn()
 <							*E704* *E705* *E707*
 A Funcref variable must start with a capital, "s:", "w:", "t:" or "b:".  You
+can use "g:" but the following name must still start with a capital.  You
 cannot have both a Funcref variable and a function with the same name.

 A special case is defining a function and directly assigning its Funcref to a
@@ -147,7 +148,7 @@ arguments: >


 1.3 Lists ~
-							*List* *Lists* *E686*
+						*list* *List* *Lists* *E686*
 A List is an ordered sequence of items.  An item can be of any type.  Items
 can be accessed by their index number.	Items can be added and removed at any
 position in the sequence.
@@ -326,6 +327,7 @@ examples: >
 Changing the order of items in a list: >
 	:call sort(list)		" sort a list alphabetically
 	:call reverse(list)		" reverse the order of items
+	:call uniq(sort(list))		" sort and remove duplicates


 For loop ~
@@ -392,7 +394,7 @@ example, to add up all the numbers in a list: >


 1.4 Dictionaries ~
-						*Dictionaries* *Dictionary*
+					*dict* *Dictionaries* *Dictionary*
 A Dictionary is an associative array: Each entry has a key and a value.  The
 entry can be located with the key.  The entries are stored without a specific
 ordering.
@@ -1003,7 +1005,7 @@ function.  Example: >



-string							*expr-string* *E114*
+string						*string* *expr-string* *E114*
 ------
 "string"		string constant		*expr-quote*

@@ -1142,7 +1144,7 @@ specified by what is prepended:
 |local-variable|     l:	  Local to a function.
 |script-variable|    s:	  Local to a |:source|'ed Vim script.
 |function-argument|  a:	  Function argument (only inside a function).
-|vim-variable|	     v:	  Global, predefined by Vim.
+|vim-variable|       v:	  Global, predefined by Vim.

 The scope name by itself can be used as a |Dictionary|.  For example, to
 delete all script-local variables: >
@@ -1454,6 +1456,13 @@ v:foldend	Used for 'foldtext': last line of closed fold.
 v:foldstart	Used for 'foldtext': first line of closed fold.
 		Read-only in the |sandbox|. |fold-foldtext|

+					*v:hlsearch* *hlsearch-variable*
+v:hlsearch	Variable that determines whether search highlighting is on. 
+		Makes sense only if 'hlsearch' is enabled which requires 
+		|+extra_search|. Setting this variable to zero acts the like 
+		|:nohlsearch| command, setting it to one acts like >
+			let &hlsearch = &hlsearch
+<
 					*v:insertmode* *insertmode-variable*
 v:insertmode	Used for the |InsertEnter| and |InsertChange| autocommand
 		events.  Values:
@@ -1511,6 +1520,7 @@ v:oldfiles	List of file names that is loaded from the |viminfo| file on
 		startup.  These are the files that Vim remembers marks for.
 		The length of the List is limited by the ' argument of the
 		'viminfo' option (default is 100).
+		When the |viminfo| file is not used the List is empty.
 		Also see |:oldfiles| and |c_#<|.
 		The List can be modified, but this has no effect on what is
 		stored in the |viminfo| file later.  If you use values other
@@ -1546,6 +1556,16 @@ v:profiling	Normally zero.	Set to one after using ":profile start".
 v:progname	Contains the name (with path removed) with which Vim was
 		invoked.  Allows you to do special initialisations for |view|,
 		|evim| etc., or any other name you might symlink to Vim.
+		Read-only.
+
+					*v:progpath* *progpath-variable*
+v:progpath	Contains the command with which Vim was invoked, including the
+		path.  Useful if you want to message a Vim server using a
+		|--remote-expr|.
+		To get the full path use: >
+			echo exepath(v:progpath)
+<		NOTE: This does not work when the command is a relative path
+		and the current directory has changed.
 		Read-only.

 					*v:register* *register-variable*
@@ -1662,7 +1682,7 @@ v:version	Version number of Vim: Major version number times 100 plus
 		is 501.  Read-only.  "version" also works, for backwards
 		compatibility.
 		Use |has()| to check if a certain patch was included, e.g.: >
-			if has("patch123")
+			if has("patch-7.4.123")
 <		Note that patch numbers are specific to the version, thus both
 		version 5.0 and 5.1 may have a patch 123, but these are
 		completely different.
@@ -1712,6 +1732,7 @@ bufnr( {expr})			Number	Number of the buffer {expr}
 bufwinnr( {expr})		Number	window number of buffer {expr}
 byte2line( {byte})		Number	line number at byte count {byte}
 byteidx( {expr}, {nr})		Number	byte index of {nr}'th char in {expr}
+byteidxcomp( {expr}, {nr})	Number	byte index of {nr}'th char in {expr}
 call( {func}, {arglist} [, {dict}])
 				any	call {func} with arguments {arglist}
 ceil( {expr})			Float	round {expr} up
@@ -1735,7 +1756,7 @@ cscope_connection( [{num} , {dbpath} [, {prepend}]])
 cursor( {lnum}, {col} [, {coladd}])
 				Number	move cursor to {lnum}, {col}, {coladd}
 cursor( {list})			Number	move cursor to position in {list}
-deepcopy( {expr})		any	make a full copy of {expr}
+deepcopy( {expr} [, {noref}])	any	make a full copy of {expr}
 delete( {fname})		Number	delete file {fname}
 did_filetype()			Number	TRUE if FileType autocommand event used
 diff_filler( {lnum})		Number	diff filler lines about {lnum}
@@ -1745,6 +1766,7 @@ escape( {string}, {chars})	String	escape {chars} in {string} with '\'
 eval( {string})			any	evaluate {string} into its value
 eventhandler( )			Number	TRUE if inside an event handler
 executable( {expr})		Number	1 if executable {expr} exists
+exepath( {expr})		String  full path of the command {expr}
 exists( {expr})			Number	TRUE if {expr} exists
 extend( {expr1}, {expr2} [, {expr3}])
 				List/Dict insert items of {expr2} into {expr1}
@@ -1797,7 +1819,8 @@ getmatches()			List	list of current matches
 getpid()			Number	process ID of Vim
 getpos( {expr})			List	position of cursor, mark, etc.
 getqflist()			List	list of quickfix items
-getreg( [{regname} [, 1]])	String	contents of register
+getreg( [{regname} [, 1 [, {list}]]])
+				String or List   contents of register
 getregtype( [{regname}])	String	type of register
 gettabvar( {nr}, {varname} [, {def}])
 				any	variable {varname} in tab {nr} or {def}
@@ -1968,7 +1991,8 @@ strridx( {haystack}, {needle} [, {start}])
 				Number	last index of {needle} in {haystack}
 strtrans( {expr})		String	translate string to make it printable
 strwidth( {expr})		Number	display cell length of the String {expr}
-submatch( {nr})			String	specific match in ":s" or substitute()
+submatch( {nr}[, {list}])	String or List
+					specific match in ":s" or substitute()
 substitute( {expr}, {pat}, {sub}, {flags})
 				String	all {pat} in {expr} replaced with {sub}
 synID( {lnum}, {col}, {trans})	Number	syntax ID at {lnum} and {col}
@@ -1978,6 +2002,7 @@ synIDtrans( {synID})		Number	translated syntax ID of {synID}
 synconcealed( {lnum}, {col})	List    info about concealing
 synstack( {lnum}, {col})	List	stack of syntax IDs at {lnum} and {col}
 system( {expr} [, {input}])	String	output of shell command/filter {expr}
+systemlist( {expr} [, {input}])	List	output of shell command/filter {expr}
 tabpagebuflist( [{arg}])	List	list of buffer numbers in tab page
 tabpagenr( [{arg}])		Number	number of current or last tab page
 tabpagewinnr( {tabarg}[, {arg}])
@@ -1995,6 +2020,8 @@ trunc( {expr})			Float	truncate Float {expr}
 type( {name})			Number	type of variable {name}
 undofile( {name})		String	undo file name for {name}
 undotree()			List	undo file tree
+uniq( {list} [, {func} [, {dict}]])
+				List	remove adjacent duplicates from a list
 values( {dict})			List	values in {dict}
 virtcol( {expr})		Number	screen column of cursor or mark
 visualmode( [expr])		String	last visual mode used
@@ -2260,7 +2287,10 @@ byteidx({expr}, {nr})					*byteidx()*
 		{expr}.  Use zero for the first character, it returns zero.
 		This function is only useful when there are multibyte
 		characters, otherwise the returned value is equal to {nr}.
-		Composing characters are counted as a separate character.
+		Composing characters are not counted separately, their byte
+		length is added to the preceding base character.  See
+		|byteidxcomp()| below for counting composing characters
+		separately.
 		Example : >
 			echo matchstr(str, ".", byteidx(str, 3))
 <		will display the fourth character.  Another way to do the
@@ -2269,7 +2299,20 @@ byteidx({expr}, {nr})					*byteidx()*
 			echo strpart(s, 0, byteidx(s, 1))
 <		If there are less than {nr} characters -1 is returned.
 		If there are exactly {nr} characters the length of the string
-		is returned.
+		in bytes is returned.
+
+byteidxcomp({expr}, {nr})					*byteidxcomp()*
+		Like byteidx(), except that a composing character is counted
+		as a separate character.  Example: >
+			let s = 'e' . nr2char(0x301)
+			echo byteidx(s, 1)
+			echo byteidxcomp(s, 1)
+			echo byteidxcomp(s, 2)
+<		The first and third echo result in 3 ('e' plus composing
+		character is 3 bytes), the second echo results in 1 ('e' is
+		one byte).
+		Only works different from byteidx() when 'encoding' is set to
+		a Unicode encoding.

 call({func}, {arglist} [, {dict}])			*call()* *E699*
 		Call function {func} with the items in |List| {arglist} as
@@ -2671,6 +2714,15 @@ executable({expr})					*executable()*
 			0	does not exist
 			-1	not implemented on this system

+exepath({expr})						*exepath()*
+		If {expr} is an executable and is either an absolute path, a
+		relative path or found in $PATH, return the full path.
+		Note that the current directory is used when {expr} starts
+		with "./", which may be a problem for Vim: >
+			echo exepath(v:progpath)
+<		If {expr} cannot be found in $PATH or is not executable then
+		an empty string is returned.
+
 							*exists()*
 exists({expr})	The result is a Number, which is non-zero if {expr} is
 		defined, zero otherwise.  The {expr} argument is a string,
@@ -2789,7 +2841,7 @@ expand({expr} [, {nosuf} [, {list}]])				*expand()*
 			<afile>		autocmd file name
 			<abuf>		autocmd buffer number (as a String!)
 			<amatch>	autocmd matched name
-			<sfile>		sourced script file name
+			<sfile>		sourced script file or function name
 			<slnum>		sourced script file line number
 			<cword>		word under the cursor
 			<cWORD>		WORD under the cursor
@@ -3175,7 +3227,7 @@ getchar([expr])						*getchar()*
 		If [expr] is 1, only check if a character is available, it is
 			not consumed.  Return zero if no character available.

-		Without {expr} and when {expr} is 0 a whole character or
+		Without [expr] and when [expr] is 0 a whole character or
 		special key is returned.  If it is an 8-bit character, the
 		result is a number.  Use nr2char() to convert it to a String.
 		Otherwise a String is returned with the encoded character.
@@ -3185,7 +3237,7 @@ getchar([expr])						*getchar()*
 		String when a modifier (shift, control, alt) was used that is
 		not included in the character.

-		When {expr} is 1 only the first byte is returned.  For a
+		When [expr] is 1 only the first byte is returned.  For a
 		one-byte character it is the character itself as a number.
 		Use nr2char() to convert it to a String.

@@ -3417,7 +3469,7 @@ getqflist()						*getqflist()*
 			:endfor


-getreg([{regname} [, 1]])				*getreg()*
+getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 		The result is a String, which is the contents of register
 		{regname}.  Example: >
 			:let cliptext = getreg('*')
@@ -3426,6 +3478,11 @@ getreg([{regname} [, 1]])				*getreg()*
 		getreg('=', 1) returns the expression itself, so that it can
 		be restored with |setreg()|.  For other registers the extra
 		argument is ignored, thus you can always give it.
+		If {list} is present and non-zero result type is changed to 
+		|List|. Each list item is one text line. Use it if you care
+		about zero bytes possibly present inside register: without
+		third argument both NLs and zero bytes are represented as NLs
+		(see |NL-used-for-Nul|).
 		If {regname} is not specified, |v:register| is used.


@@ -3435,7 +3492,7 @@ getregtype([{regname}])					*getregtype()*
 		    "v"			for |characterwise| text
 		    "V"			for |linewise| text
 		    "<CTRL-V>{width}"	for |blockwise-visual| text
-		    0			for an empty or unknown register
+		    ""			for an empty or unknown register
 		<CTRL-V> is one character with value 0x16.
 		If {regname} is not specified, |v:register| is used.

@@ -4109,6 +4166,8 @@ maparg({name}[, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 				     (|mapmode-ic|)
 		  "sid"	     The script local ID, used for <sid> mappings
 			     (|<SID>|).
+		  "nowait"   Do not wait for other, longer mappings.
+			     (|:map-<nowait>|).

 		The mappings local to the current buffer are checked first,
 		then the global mappings.
@@ -4210,6 +4269,9 @@ matchadd({group}, {pattern}[, {priority}[, {id}]])
 		"match").  It will be highlighted with {group}.  Returns an
 		identification number (ID), which can be used to delete the
 		match using |matchdelete()|.
+		Matching is case sensitive and magic, unless case sensitivity
+		or magicness are explicitly overridden in {pattern}.  The
+		'magic', 'smartcase' and 'ignorecase' options are not used.

 		The optional {priority} argument assigns a priority to the
 		match.	A match with a high priority will have its
@@ -4419,6 +4481,9 @@ getpos({expr})	Get the position for {expr}.  For possible values of {expr}
 		it is the offset in screen columns from the start of the
 		character.  E.g., a position within a <Tab> or after the last
 		character.
+		Note that for '< and '> Visual mode matters: when it is "V"
+		(visual line mode) the column of '< is zero and the column of
+		'> is a large number.
 		This can be used to save and restore the cursor position: >
 			let save_cursor = getpos(".")
 			MoveTheCursorAround
@@ -5242,6 +5307,10 @@ setpos({expr}, {list})
 		character.  E.g., a position within a <Tab> or after the last
 		character.

+		Note that for '< and '> changing the line number may result in
+		the marks to be effectively be swapped, so that '< is always
+		before '>.
+
 		Returns 0 when the position could be set, -1 otherwise.
 		An error message is given if {expr} is invalid.

@@ -5300,6 +5369,8 @@ setqflist({list} [, {action}])				*setqflist()*
 							*setreg()*
 setreg({regname}, {value} [,{options}])
 		Set the register {regname} to {value}.
+		{value} may be any value returned by |getreg()|, including 
+		a |List|.
 		If {options} contains "a" or {regname} is upper case,
 		then the value is appended.
 		{options} can also contain a register type specification:
@@ -5312,10 +5383,15 @@ setreg({regname}, {value} [,{options}])
 		in the longest line (counting a <Tab> as 1 character).

 		If {options} contains no register settings, then the default
-		is to use character mode unless {value} ends in a <NL>.
-		Setting the '=' register is not possible, but you can use >
-			:let @= = var_expr
-<		Returns zero for success, non-zero for failure.
+		is to use character mode unless {value} ends in a <NL> for 
+		string {value} and linewise mode for list {value}. Blockwise 
+		mode is never selected automatically.
+		Returns zero for success, non-zero for failure.
+
+							*E883*
+		Note: you may not use |List| containing more then one item to 
+		      set search and expression registers. Lists containing no 
+		      items act like empty strings.

 		Examples: >
 			:call setreg(v:register, @*)
@@ -5323,8 +5399,11 @@ setreg({regname}, {value} [,{options}])
 			:call setreg('a', "1\n2\n3", 'b5')

 <		This example shows using the functions to save and restore a
-		register. >
-			:let var_a = getreg('a', 1)
+		register (note: you may not reliably restore register value 
+		without using the third argument to |getreg()| as without it 
+		newlines are represented as newlines AND Nul bytes are 
+		represented as newlines as well, see |NL-used-for-Nul|). >
+			:let var_a = getreg('a', 1, 1)
 			:let var_amode = getregtype('a')
 			    ....
 			:call setreg('a', var_a, var_amode)
@@ -5390,6 +5469,7 @@ shellescape({string} [, {special}])			*shellescape()*
 <		This results in a directory listing for the file under the
 		cursor.  Example of use with |system()|: >
 		    :call system("chmod +w -- " . shellescape(expand("%")))
+<		See also |::S|.


 shiftwidth()						*shiftwidth()*
@@ -5449,20 +5529,26 @@ sinh({expr})						*sinh()*


 sort({list} [, {func} [, {dict}]])			*sort()* *E702*
-		Sort the items in {list} in-place.  Returns {list}.  If you
-		want a list to remain unmodified make a copy first: >
+		Sort the items in {list} in-place.  Returns {list}.
+		
+		If you want a list to remain unmodified make a copy first: >
 			:let sortedlist = sort(copy(mylist))
 <		Uses the string representation of each item to sort on.
 		Numbers sort after Strings, |Lists| after Numbers.
 		For sorting text in the current buffer use |:sort|.
+
 		When {func} is given and it is one then case is ignored.
-		{dict} is for functions with the "dict" attribute.  It will be
-		used to set the local variable "self". |Dictionary-function|
 		When {func} is a |Funcref| or a function name, this function
 		is called to compare items.  The function is invoked with two
 		items as argument and must return zero if they are equal, 1 or
 		bigger if the first one sorts after the second one, -1 or
 		smaller if the first one sorts before the second one.
+
+		{dict} is for functions with the "dict" attribute.  It will be
+		used to set the local variable "self". |Dictionary-function|
+
+		Also see |uniq()|.
+
 		Example: >
 			func MyCompare(i1, i2)
 			   return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
@@ -5604,7 +5690,7 @@ strchars({expr})					*strchars()*

 strdisplaywidth({expr}[, {col}])			*strdisplaywidth()*
 		The result is a Number, which is the number of display cells
-		String {expr} occupies on the screen.
+		String {expr} occupies on the screen when it starts a {col}.
 		When {col} is omitted zero is used.  Otherwise it is the
 		screen column where to start.  This matters for Tab
 		characters.
@@ -5729,12 +5815,23 @@ strwidth({expr})					*strwidth()*
 		Ambiguous, this function's return value depends on 'ambiwidth'.
 		Also see |strlen()|, |strdisplaywidth()| and |strchars()|.

-submatch({nr})						*submatch()*
+submatch({nr}[, {list}])				*submatch()*
 		Only for an expression in a |:substitute| command or
 		substitute() function.
 		Returns the {nr}'th submatch of the matched text.  When {nr}
 		is 0 the whole matched text is returned.
+		Note that a NL in the string can stand for a line break of a
+		multi-line match or a NUL character in the text.
 		Also see |sub-replace-expression|.
+
+		If {list} is present and non-zero then submatch() returns 
+		a list of strings, similar to |getline()| with two arguments. 
+		NL characters in the text represent NUL characters in the
+		text.
+		Only returns more than one item for |:substitute|, inside
+		|substitute()| this list will always contain one or zero
+		items, since there are no real line breaks.
+
 		Example: >
 			:s/\d\+/\=submatch(0) + 1/
 <		This finds the first number in the line and adds one to it.
@@ -5867,23 +5964,36 @@ synstack({lnum}, {col})					*synstack()*
 		valid positions.

 system({expr} [, {input}])				*system()* *E677*
-		Get the output of the shell command {expr}.
-		When {input} is given, this string is written to a file and
-		passed as stdin to the command.  The string is written as-is,
-		you need to take care of using the correct line separators
-		yourself.  Pipes are not used.
-		Note: Use |shellescape()| to escape special characters in a
-		command argument.  Newlines in {expr} may cause the command to
-		fail.  The characters in 'shellquote' and 'shellxquote' may
-		also cause trouble.
+		Get the output of the shell command {expr} as a string.  See
+		|systemlist()| to get the output as a List.
+
+		When {input} is given and is a string this string is written 
+		to a file and passed as stdin to the command.  The string is 
+		written as-is, you need to take care of using the correct line 
+		separators yourself.
+		If {input} is given and is a |List| it is written to the file
+		in a way |writefile()| does with {binary} set to "b" (i.e.
+		with a newline between each list item with newlines inside
+		list items converted to NULs).  
+		Pipes are not used.
+
+		Note: Use |shellescape()| or |::S| with |expand()| or 
+		|fnamemodify()| to escape special characters in a command 
+		argument.  Newlines in {expr} may cause the command to fail.  
+		The characters in 'shellquote' and 'shellxquote' may also 
+		cause trouble.
 		This is not to be used for interactive commands.

 		The result is a String.  Example: >
 		    :let files = system("ls " .  shellescape(expand('%:h')))
+		    :let files = system('ls ' . expand('%:h:S'))

 <		To make the result more system-independent, the shell output
 		is filtered to replace <CR> with <NL> for Macintosh, and
 		<CR><NL> with <NL> for DOS-like systems.
+		To avoid the string being truncated at a NUL, all NUL
+		characters are replaced with SOH (0x01).
+
 		The command executed is constructed using several options:
 	'shell' 'shellcmdflag' 'shellxquote' {expr} 'shellredir' {tmp} 'shellxquote'
 		({tmp} is an automatically generated file name).
@@ -5903,6 +6013,16 @@ system({expr} [, {input}])				*system()* *E677*
 		Use |:checktime| to force a check.


+systemlist({expr} [, {input}])				*systemlist()*
+		Same as |system()|, but returns a |List| with lines (parts of 
+		output separated by NL) with NULs transformed into NLs. Output 
+		is the same as |readfile()| will output with {binary} argument 
+		set to "b".
+
+		Returns an empty string on error, so be careful not to run 
+		into |E706|.
+
+
 tabpagebuflist([{arg}])					*tabpagebuflist()*
 		The result is a |List|, where each item is the number of the
 		buffer associated with each window in the current tab page.
@@ -5925,7 +6045,7 @@ tabpagenr([{arg}])					*tabpagenr()*
 		The number can be used with the |:tab| command.


-tabpagewinnr({tabarg}, [{arg}])				*tabpagewinnr()*
+tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
 		Like |winnr()| but for tab page {tabarg}.
 		{tabarg} specifies the number of tab page to be used.
 		{arg} is used like with |winnr()|:
@@ -6125,6 +6245,14 @@ undotree()						*undotree()*
 				blocks.  Each item may again have an "alt"
 				item.

+uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
+		Remove second and succeeding copies of repeated adjacent
+		{list} items in-place.  Returns {list}.  If you want a list
+		to remain unmodified make a copy first: >
+			:let newlist = uniq(copy(mylist))
+<		The default compare function uses the string representation of
+		each item.  For the use of {func} and {dict} see |sort()|.
+
 values({dict})						*values()*
 		Return a |List| with all the values of {dict}.	The |List| is
 		in arbitrary order.
@@ -6327,13 +6455,23 @@ There are three types of features:
    Example: >
 	:if has("gui_running")
 <							*has-patch*
-3.  Included patches.  First check |v:version| for the version of Vim.
-    Then the "patch123" feature means that patch 123 has been included for
-    this version.  Example (checking version 6.2.148 or later): >
+3.  Included patches.  The "patch123" feature means that patch 123 has been
+    included.  Note that this form does not check the version of Vim, you need
+    to inspect |v:version| for that.
+    Example (checking version 6.2.148 or later): >
 	:if v:version > 602 || v:version == 602 && has("patch148")
-<   Note that it's possible for patch 147 to be omitted even though 148 is
+<    Note that it's possible for patch 147 to be omitted even though 148 is
    included.

+4.  Beyond a certain version or at a certain version and including a specific
+    patch.  The "patch-7.4.123" feature means that the Vim version is 7.5 or
+    later, or it is version 7.4 and patch 123 was included.
+    The example above can be simplified to: >
+	:if has("patch-6.2.148")
+<    Note that it's possible for patch 147 to be omitted even though 148 is
+    included.
+
+acl			Compiled with |ACL| support.
 all_builtin_terms	Compiled with all builtin terminals enabled.
 amiga			Amiga version of Vim.
 arabic			Compiled with Arabic support |Arabic|.
@@ -6504,7 +6642,9 @@ windows			Compiled with support for more than one window.
 writebackup		Compiled with 'writebackup' default on.
 xfontset		Compiled with X fontset support |xfontset|.
 xim			Compiled with X input method support |xim|.
-xpm_w32			Compiled with pixmap support for Win32.
+xpm			Compiled with pixmap support.
+xpm_w32			Compiled with pixmap support for Win32. (Only for
+			backward compatibility. Use "xpm" instead.)
 xsmp			Compiled with X session management support.
 xsmp_interact		Compiled with interactive X session management support.
 xterm_clipboard		Compiled with support for xterm clipboard.
@@ -6581,7 +6721,8 @@ See |:verbose-cmd| for more information.
 :fu[nction][!] {name}([arguments]) [range] [abort] [dict]
 			Define a new function by the name {name}.  The name
 			must be made of alphanumeric characters and '_', and
-			must start with a capital or "s:" (see above).
+			must start with a capital or "s:" (see above).  When
+			using a capital "g:" be prepended.

 			{name} can also be a |Dictionary| entry that is a
 			|Funcref|: >
@@ -6600,7 +6741,7 @@ See |:verbose-cmd| for more information.

 			For the {arguments} see |function-argument|.

-						*a:firstline* *a:lastline*
+					*:func-range* *a:firstline* *a:lastline*
 			When the [range] argument is added, the function is
 			expected to take care of a range itself.  The range is
 			passed as "a:firstline" and "a:lastline".  If [range]
@@ -6609,10 +6750,10 @@ See |:verbose-cmd| for more information.
 			of each line.  See |function-range-example|.
 			The cursor is still moved to the first line of the
 			range, as is the case with all Ex commands.
-
+								*:func-abort*
 			When the [abort] argument is added, the function will
 			abort as soon as an error is detected.
-
+								*:func-dict*
 			When the [dict] argument is added, the function must
 			be invoked through an entry in a |Dictionary|.	The
 			local variable "self" will then be set to the
@@ -7274,6 +7415,8 @@ This does NOT work: >
 			{pattern}, so long as it does not have a special
 			meaning (e.g., '|' or '"') and doesn't occur inside
 			{pattern}.
+			Information about the exception is available in
+			|v:exception|.  Also see |throw-variables|.
 			NOTE: It is not reliable to ":catch" the TEXT of
 			an error message because it may vary in different
 			locales.
@@ -7417,13 +7560,22 @@ This does NOT work: >
 			for Vim commands, |shellescape()| for |:!| commands.
 			Examples: >
 		:execute "e " . fnameescape(filename)
-		:execute "!ls " . shellescape(expand('%:h'), 1)
+		:execute "!ls " . shellescape(filename, 1)
 <
 			Note: The executed string may be any command-line, but
-			you cannot start or end a "while", "for" or "if"
-			command.  Thus this is illegal: >
-		:execute 'while i > 5'
-		:execute 'echo "test" | break'
+			starting or ending "if", "while" and "for" does not
+			always work, because when commands are skipped the
+			":execute" is not evaluated and Vim loses track of
+			where blocks start and end.  Also "break" and
+			"continue" should not be inside ":execute".
+			This example does not work, because the ":execute" is
+			not evaluated and Vim does not see the "while", and
+			gives an error for finding an ":endwhile": >
+		:if 0
+		: execute 'while i > 5'
+		:  echo "test"
+		: endwhile
+		:endif
 <
 			It is allowed to have a "while" or "if" command
 			completely in the executed string: >
@@ -0,0 +1,51 @@
+.TH EVIM 1 "2002 February 16"
+.SH 名前
+evim \- easy Vim, モードレスエディタ Vim
+.SH 書式
+.br
+.B evim
+[options] [file ..]
+.br
+.B eview
+.SH 説明
+.B eVim
+は
+.B Vim
+を起動して、モードレスエディタとして動作するためのオプションを設定します。
+Vim の動作が point-and-click エディタのような動作になります。
+MS-Windows のメモ帳のような動作です。
+.B eVim
+は常に GUI で起動し、メニューとツールバーを表示します。
+.PP
+どうしても Vim の操作に馴染めない場合に使ってください。
+編集効率は下がります。
+.PP
+.B eview
+は同様に、読み込み専用モードで起動します。evim \-R と同じです。
+.PP
+引数や Vim についての詳細は vim(1) を参照してください。
+.PP
+オプション 'insertmode' が設定され、テキストを直接、入力できるようになりま
+す。
+.br
+コピーとペーストのキー操作が MS-Windows と同じになるように、マップが設定され
+ます。
+CTRL-X が切り取り、CTRL-C がコピー、CTRL-V がペーストです。
+標準の CTRL-V の操作は CTRL-Q に割り当てられます。
+.SH オプション
+vim(1) を参照してください。
+.SH ファイル
+.TP 15
+/usr/local/lib/vim/evim.vim
+eVim の初期化スクリプト。
+.SH 別名
+evim は "gumbies のための Vim" とも呼ばれています。
+evim を使っているあなたはきっと、頭にハンカチをかぶっているのです。
+(訳注: gumbies は Monty Python に登場するおもしろ集団。ハンカチをかぶっ
+ている。)
+.SH 関連項目
+vim(1)
+.SH 著者
+.B Vim
+のほとんどの機能は Bram Moolenaar が開発し、多くの人が協力しました。
+メニューの Help/Credits を参照してください。
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.4a.  Last change: 2010 Aug 07
+*farsi.txt*     For Vim version 7.4.  Last change: 2010 Aug 07


 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.4a.  Last change: 2013 May 25
+*filetype.txt*  For Vim version 7.4.  Last change: 2013 Dec 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -447,23 +447,25 @@ g:changelog_new_date_format
 				%%	insert a single '%' character
 				%d	insert the date from above
 				%u	insert the user from above
+                                %p	insert result of b:changelog_entry_prefix
 				%c	where to position cursor when done
-			The default is "%d  %u\n\n\t* %c\n\n", which produces
+			The default is "%d  %u\n\n\t* %p%c\n\n", which produces
 			something like (| is where cursor will be, unless at
 			the start of the line where it denotes the beginning
 			of the line) >
 				|2003-01-14  Full Name  <user@host>
 				|
-				|        * |
+				|        * prefix|
 <
 g:changelog_new_entry_format
 			The format used when creating a new entry.
 			The following table describes special tokens in the
 			string:
+                                %p	insert result of b:changelog_entry_prefix
 				%c	where to position cursor when done
 			The default is "\t*%c", which produces something
 			similar to >
-				|        * |
+				|        * prefix|
 <
 g:changelog_date_entry_search
 			The search pattern to use when searching for a
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.4a.  Last change: 2010 May 13
+*fold.txt*      For Vim version 7.4.  Last change: 2013 Dec 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -285,9 +285,10 @@ zF		Create a fold for [count] lines.  Works like "zf".
 							*zd* *E351*
 zd		Delete one fold at the cursor.  When the cursor is on a folded
 		line, that fold is deleted.  Nested folds are moved one level
-		up.  In Visual mode all folds (partially) in the selected area
-		are deleted.  Careful: This easily deletes more folds than you
-		expect and there is no undo.
+		up.  In Visual mode one level of all folds (partially) in the
+		selected area are deleted.
+		Careful: This easily deletes more folds than you expect and
+		there is no undo for manual folding.
 		This only works when 'foldmethod' is "manual" or "marker".
 		Also see |fold-delete-marker|.

@@ -1,4 +1,4 @@
-*ft_ada.txt*	For Vim version 7.4a.  Last change: 2010 Jul 20
+*ft_ada.txt*	For Vim version 7.4.  Last change: 2010 Jul 20


 		    ADA FILE TYPE PLUG-INS REFERENCE MANUAL~
@@ -1,4 +1,4 @@
-*ft_sql.txt*	For Vim version 7.4a.  Last change: 2013 May 15
+*ft_sql.txt*	For Vim version 7.4.  Last change: 2013 May 15

 by David Fishburn

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.4a.  Last change: 2013 Jun 12
+*gui.txt*       For Vim version 7.4.  Last change: 2014 Mar 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -133,6 +133,7 @@ task bar with the 'guiheadroom' option.
 :winp[os]
 		Display current position of the top left corner of the GUI vim
 		window in pixels.  Does not work in all versions.
+		Also see |getwinposx()| and |getwinposy()|.

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

 If you are running the X Window System, you can get information about the
-window Vim is running in with this command: >
+window Vim is running in with these commands: >
 	:!xwininfo -id $WINDOWID
+	:!xprop -id $WINDOWID
+	:execute '!xwininfo -id ' . v:windowid
+	:execute '!xprop -id ' . v:windowid
 <
 							*gui-IME* *iBus*
 Input methods for international characters in X that rely on the XIM
@@ -1,4 +1,4 @@
-*gui_mac.txt*	For Vim version 7.4a.  Last change: 2012 Jan 13
+*gui_mac.txt*	For Vim version 7.4.  Last change: 2012 Jan 13


 		  VIM REFERENCE MANUAL    by Bjorn Winckler
@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.4a.  Last change: 2005 Mar 29
+*gui_w16.txt*   For Vim version 7.4.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.4a.  Last change: 2012 Aug 04
+*gui_w32.txt*   For Vim version 7.4.  Last change: 2012 Aug 04


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.4a.  Last change: 2011 Sep 14
+*gui_x11.txt*   For Vim version 7.4.  Last change: 2014 Mar 08


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

 ==============================================================================
 8. Compiling						*gui-x11-compiling*
@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.4a.  Last change: 2009 Jun 24
+*hangulin.txt*  For Vim version 7.4.  Last change: 2009 Jun 24


 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
@@ -1,4 +1,4 @@
-*hebrew.txt*    For Vim version 7.4a.  Last change: 2007 Jun 14
+*hebrew.txt*    For Vim version 7.4.  Last change: 2007 Jun 14


 	   VIM REFERENCE MANUAL    by Ron Aaron (and Avner Lottem)
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.4a.  Last change: 2012 Dec 06
+*help.txt*	For Vim version 7.4.  Last change: 2012 Dec 06

 			VIM - main help file
 									 k
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 7.4a.  Last change: 2012 Nov 28
+*helphelp.txt*	For Vim version 7.4.  Last change: 2012 Nov 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 7.4a.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 7.4.  Last change: 2006 Apr 02


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.4a.  Last change: 2011 Jun 12
+*if_cscop.txt*  For Vim version 7.4.  Last change: 2011 Jun 12


 		  VIM REFERENCE MANUAL    by Andy Kahn
@@ -1,4 +1,4 @@
-*if_lua.txt*    For Vim version 7.4a.  Last change: 2012 Jun 29
+*if_lua.txt*    For Vim version 7.4.  Last change: 2013 Sep 04


 		  VIM REFERENCE MANUAL    by Luis Carvalho
@@ -135,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".
+				"function". NOT IMPLEMENTED YET

 	vim.buffer([arg])	If "arg" is a number, returns buffer with
 				number "arg" in the buffer list or, if "arg"
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 7.4a.  Last change: 2012 Dec 17
+*if_mzsch.txt*  For Vim version 7.4.  Last change: 2012 Dec 17


 		  VIM REFERENCE MANUAL    by Sergey Khorev
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 7.4a.  Last change: 2008 Aug 16
+*if_ole.txt*    For Vim version 7.4.  Last change: 2008 Aug 16


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.4a.  Last change: 2012 Oct 25
+*if_perl.txt*   For Vim version 7.4.  Last change: 2013 Oct 05


 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.4a.  Last change: 2013 Jun 28
+*if_pyth.txt*   For Vim version 7.4.  Last change: 2013 Jul 10


 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -23,6 +23,7 @@ The Python 2.x interface is available only when Vim was compiled with the
 |+python| feature.
 The Python 3 interface is available only when Vim was compiled with the
 |+python3| feature.
+Both can be available at the same time, but read |python-2-and-3|.

 ==============================================================================
 1. Commands						*python-commands*
@@ -711,7 +712,7 @@ Vim can be built in four ways (:version output):
 3. Python 3 support only    (-python, +python3 or +python3/dyn)
 4. Python 2 and 3 support   (+python/dyn, +python3/dyn)

-Some more details on the special case 4:
+Some more details on the special case 4:  *python-2-and-3*

 When Python 2 and Python 3 are both supported they must be loaded dynamically.

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


 		  VIM REFERENCE MANUAL    by Shugo Maeda
@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 7.4a.  Last change: 2005 Mar 29
+*if_sniff.txt*	For Vim version 7.4.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 7.4a.  Last change: 2012 Aug 02
+*if_tcl.txt*    For Vim version 7.4.  Last change: 2012 Aug 02


 		  VIM REFERENCE MANUAL    by Ingo Wilken
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.4a.  Last change: 2013 Jun 13
+*indent.txt*    For Vim version 7.4.  Last change: 2013 Nov 05


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

 								*cino-#*
-	#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.
+	#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.


 The defaults, spelled out in full, are:
@@ -556,7 +558,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 '#'.
+- It starts with '#' (preprocessor directives), if 'cinkeys' contains '#0'.
 - 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.
@@ -581,8 +583,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 always universally followed, so the Clojure indent
-script offers a few configurable options, listed below.
+These conventions are not 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.
@@ -596,7 +598,6 @@ without limits.
 	" Default
 	let g:clojure_maxlines = 100
 <
-
 						*g:clojure_fuzzy_indent*
 					*g:clojure_fuzzy_indent_patterns*
 					*g:clojure_fuzzy_indent_blacklist*
@@ -650,7 +651,6 @@ 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,7 +675,28 @@ 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*

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.4a.  Last change: 2013 Jun 21
+*index.txt*     For Vim version 7.4.  Last change: 2014 Mar 25


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1124,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|	:caddb[uffer]	add errors from buffer
-|:caddexpr|	:cad[dexpr]	add errors from expr
+|:caddbuffer|	:cad[dbuffer]	add errors from buffer
+|:caddexpr|	:cadde[xpr]	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
@@ -1191,9 +1191,12 @@ tag	      command	      action ~
 |:digraphs|	:dig[raphs]	show or enter digraphs
 |:display|	:di[splay]	display registers
 |:djump|	:dj[ump]	jump to #define
-|:dlist|	:dl[ist]	list #defines
+|:dl|		:dl		short for |:delete| with the 'l' flag
+|:dl|		:del[ete]l	short for |:delete| with the 'l' flag
+|: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
 |:drop|		:dr[op]		jump to window editing file or edit file in
 				current window
 |:dsearch|	:ds[earch]	list one #define
@@ -1272,6 +1275,7 @@ 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
@@ -1359,13 +1363,14 @@ 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 command don't trigger autocommands
+|:noautocmd|	:noa[utocmd]	following commands 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
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.4a.  Last change: 2013 Jul 04
+*insert.txt*    For Vim version 7.4.  Last change: 2013 Jul 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1359,7 +1359,7 @@ Complete:

 Completion works in separate JavaScript files (&ft==javascript), inside of
 <script> tag of (X)HTML and in values of event attributes (including scanning
-of external files.
+of external files).

 DOM compatibility

@@ -1515,8 +1515,7 @@ The basic form of this variable is: >
    let g:omni_syntax_group_include_{filetype} = 'regex,comma,separated'

 The PHP language has an enormous number of items which it knows how to syntax
-highlight.  These these items will be available within the omni completion
-list.  
+highlight.  These items will be available within the omni completion list.

 Some people may find this list unwieldy or are only interested in certain
 items.  There are two ways to prune this list (if necessary).  If you find
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.4a.  Last change: 2013 Jun 17
+*intro.txt*     For Vim version 7.4.  Last change: 2013 Jun 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4a.  Last change: 2013 Jun 29
+*map.txt*       For Vim version 7.4.  Last change: 2013 Aug 22


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -380,11 +380,12 @@ it's just used here for this situation.
   The simplest way to load a set of related language mappings is by using the
 'keymap' option.  See |45.5|.
   In Insert mode and in Command-line mode the mappings can be disabled with
-the CTRL-^ command |i_CTRL-^| |c_CTRL-^|.  When starting to enter a normal
-command line (not a search pattern) the mappings are disabled until a CTRL-^
-is typed.  The state last used is remembered for Insert mode and Search
-patterns separately.  The state for Insert mode is also used when typing a
-character as an argument to command like "f" or "t".
+the CTRL-^ command |i_CTRL-^| |c_CTRL-^|. These commands change the value of
+the 'iminsert' option.  When starting to enter a normal command line (not a
+search pattern) the mappings are disabled until a CTRL-^ is typed.  The state
+last used is remembered for Insert mode and Search patterns separately.  The
+state for Insert mode is also used when typing a character as an argument to
+command like "f" or "t".
   Language mappings will never be applied to already mapped characters.  They
 are only used for typed characters.  This assumes that the language mapping
 was already done when typing the mapping.
@@ -592,12 +593,12 @@ 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 %<CR>:echo "the end"<CR>
+   :map  _ls  :!ls -l %:S<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'
 option is on.
-
+							*map-error*
 Note that when an error is encountered (that causes an error message or beep)
 the rest of the mapping is not executed.  This is Vi-compatible.

@@ -1358,6 +1359,8 @@ 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 @@
-*mbyte.txt*     For Vim version 7.4a.  Last change: 2013 May 18
+*mbyte.txt*     For Vim version 7.4.  Last change: 2013 May 18


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.4a.  Last change: 2013 Feb 23
+*message.txt*   For Vim version 7.4.  Last change: 2013 Feb 23


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.4a.  Last change: 2012 Jan 15
+*mlang.txt*     For Vim version 7.4.  Last change: 2012 Jan 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.4a.  Last change: 2013 Mar 07
+*motion.txt*    For Vim version 7.4.  Last change: 2014 Feb 11


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -236,6 +236,8 @@ g$ or g<End>		When lines wrap ('wrap' on): To the last character of
 			the line is not on the screen or when a count is used.
 			Additionally, vertical movements keep the column,
 			instead of going to the end of the line.
+			When 'virtualedit' is enabled moves to the end of the
+			screen line.
 			{not in Vi}

 							*bar*
@@ -341,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
@@ -1083,7 +1085,8 @@ only once.

 When the |:keepjumps| command modifier is used, jumps are not stored in the
 jumplist.  Jumps are also not stored in other cases, e.g., in a |:global|
-command.  You can explicitly add a jump by setting the ' mark.
+command.  You can explicitly add a jump by setting the ' mark with "m'".  Note
+that calling setpos() does not do this.

 After the CTRL-O command that got you into line 1154 you could give another
 jump command (e.g., "G").  The jump list would then become:
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.4a.  Last change: 2012 Jan 26
+*netbeans.txt*  For Vim version 7.4.  Last change: 2012 Jan 26


 		  VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.4a.  Last change: 2013 Jul 07
+*options.txt*	For Vim version 7.4.  Last change: 2014 Mar 23


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -992,7 +992,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'backupdir'* *'bdir'*
 'backupdir' 'bdir'	string	(default for Amiga: ".,t:",
-				 for MS-DOS and Win32: ".,c:/tmp,c:/temp"
+				 for MS-DOS and Win32: ".,$TEMP,c:/tmp,c:/temp"
 				 for Unix: ".,~/tmp,~/")
 			global
 			{not in Vi}
@@ -1889,8 +1889,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 	A sequence of single character flags.  When a character is present
-	this indicates vi-compatible behavior.  This is used for things where
-	not being vi-compatible is mostly or sometimes preferred.
+	this indicates Vi-compatible behavior.  This is used for things where
+	not being Vi-compatible is mostly or sometimes preferred.
 	'cpoptions' stands for "compatible-options".
 	Commas can be added for readability.
 	To avoid problems with flags that are added in the future, use the
@@ -2482,7 +2482,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'directory'* *'dir'*
 'directory' 'dir'	string	(default for Amiga: ".,t:",
-				 for MS-DOS and Win32: ".,c:\tmp,c:\temp"
+				 for MS-DOS and Win32: ".,$TEMP,c:\tmp,c:\temp"
 				 for Unix: ".,~/tmp,/var/tmp,/tmp")
 			global
 	List of directory names for the swap file, separated with commas.
@@ -4731,7 +4731,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'lispwords'* *'lw'*
 'lispwords' 'lw'	string	(default is very long)
-			global
+			global or local to buffer |global-local|
 			{not in Vi}
 			{not available when compiled without the |+lispindent|
 			feature}
@@ -4872,8 +4872,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global or local to buffer |global-local|
 			{not in Vi}
 	Program to use for the ":make" command.  See |:make_makeprg|.
-	This option may contain '%' and '#' characters, which are expanded to
-	the current and alternate file name. |:_%| |:_#|
+	This option may contain '%' and '#' characters (see  |:_%| and |:_#|), 
+	which are expanded to the current and alternate file name.  Use |::S| 
+	to escape file names in case they contain special characters.
 	Environment variables are expanded |:set_env|.  See |option-backslash|
 	about including spaces and backslashes.
 	Note that a '|' must be escaped twice: once for ":set" and once for
@@ -6670,6 +6671,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	region by listing them: "en_us,en_ca" supports both US and Canadian
 	English, but not words specific for Australia, New Zealand or Great
 	Britain.
+	If the name "cjk" is included East Asian characters are excluded from
+	spell checking.  This is useful when editing text that also has Asian
+	words.
 							*E757*
 	As a special case the name of a .spl file can be given as-is.  The
 	first "_xx" in the name is removed and used as the region name
@@ -6993,6 +6997,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	immediately deleted.  When 'swapfile' is set, and 'updatecount' is
 	non-zero, a swap file is immediately created.
 	Also see |swap-file| and |'swapsync'|.
+	If you want to open a new buffer without creating a swap file for it,
+	use the |:noswapfile| modifier.

 	This option is used together with 'bufhidden' and 'buftype' to
 	specify special kinds of buffers.   See |special-buffers|.
@@ -7721,7 +7727,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'undolevels'* *'ul'*
 'undolevels' 'ul'	number	(default 100, 1000 for Unix, VMS,
 						Win32 and OS/2)
-			global
+			global or local to buffer |global-local|
 			{not in Vi}
 	Maximum number of changes that can be undone.  Since undo information
 	is kept in memory, higher numbers will cause more memory to be used
@@ -7732,8 +7738,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	But you can also get Vi compatibility by including the 'u' flag in
 	'cpoptions', and still be able to use CTRL-R to repeat undo.
 	Also see |undo-two-ways|.
-	Set to a negative number for no undo at all: >
-		set ul=-1
+	Set to -1 for no undo at all.  You might want to do this only for the
+	current buffer: >
+		setlocal ul=-1
 <	This helps when you run out of memory for a single change.
 	Also see |clear-undo|.

@@ -7990,8 +7997,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	if the line was empty.  But it is far from Vi compatible.  It may also
 	break some plugins or Vim scripts.  For example because |l| can move
 	the cursor after the last character.  Use with care!
-	Using the |$| command will move to the last character in the line, not
+	Using the `$` command will move to the last character in the line, not
 	past it.  This may actually move the cursor to the left!
+	The `g$` command will move to the end of the screen line.
 	It doesn't make sense to combine "all" with "onemore", but you will
 	not get a warning for it.

@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.4a.  Last change: 2010 May 30
+*os_390.txt*    For Vim version 7.4.  Last change: 2010 May 30


 		  VIM REFERENCE MANUAL	  by Ralf Schandl
@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 7.4a.  Last change: 2010 Aug 14
+*os_amiga.txt*  For Vim version 7.4.  Last change: 2010 Aug 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 7.4a.  Last change: 2010 Aug 14
+*os_beos.txt*	For Vim version 7.4.  Last change: 2010 Aug 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 7.4a.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 7.4.  Last change: 2006 Mar 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 7.4a.  Last change: 2006 Apr 30
+*os_mac.txt*    For Vim version 7.4.  Last change: 2006 Apr 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.4a.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 7.4.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.4a.  Last change: 2005 Mar 29
+*os_msdos.txt*  For Vim version 7.4.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 7.4a.  Last change: 2007 Apr 22
+*os_os2.txt*    For Vim version 7.4.  Last change: 2007 Apr 22


 		  VIM REFERENCE MANUAL    by Paul Slootman
@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 7.4a.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 7.4.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Julian Kinraid
@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 7.4a.  Last change: 2011 May 10
+*os_risc.txt*   For Vim version 7.4.  Last change: 2011 May 10


 		  VIM REFERENCE MANUAL    by Thomas Leonard
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 7.4a.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 7.4.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.4a.  Last change: 2011 Aug 14
+*os_vms.txt*    For Vim version 7.4.  Last change: 2014 Feb 24


 		  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,6 +764,22 @@ 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 agains 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.4a.  Last change: 2012 May 18
+*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.

 ==============================================================================
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.4a.  Last change: 2013 Jul 06
+*pattern.txt*   For Vim version 7.4.  Last change: 2014 Feb 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -192,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		change until end of match
+	c//e<CR>	change until end of match
 	bar<Esc>	type replacement
 	//<CR>		go to start of next match
-	c//e		change until end of match
+	c//e<CR>	change until end of match
 	beep<Esc>	type another replacement
 			etc.
 <
@@ -1,4 +1,4 @@
-*pi_getscript.txt*  For Vim version 7.4a.  Last change: 2012 Apr 07
+*pi_getscript.txt*  For Vim version 7.0.  Last change: 2013 Nov 29
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
@@ -385,6 +385,10 @@ 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,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 7.4a.  Last change: 2012 Jul 19
+*pi_gzip.txt*   For Vim version 7.4.  Last change: 2012 Jul 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 7.4a.  Last change: 2013 May 18
+*pi_netrw.txt*  For Vim version 7.4.  Last change: 2014 Mar 20

 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -6,7 +6,7 @@
 Author:  Charles E. Campbell  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)

-Copyright: Copyright (C) 1999-2013 Charles E Campbell    *netrw-copyright*
+Copyright: Copyright (C) 1999-2014 Charles E Campbell    *netrw-copyright*
 	The VIM LICENSE applies to the files in this package, including
 	netrw.vim, pi_netrw.txt, netrwFileHandlers.vim, netrwSettings.vim, and
 	syntax/netrw.vim.  Like anything else that's free, netrw.vim and its
@@ -49,6 +49,7 @@ Copyright: Copyright (C) 1999-2013 Charles E Campbell    *netrw-copyright*
      Quick Reference: Commands...........................|netrw-browse-cmds|
      Bookmarking A Directory.............................|netrw-mb|
      Browsing............................................|netrw-cr|
+        Squeezing the Current Tree-Listing Directory......|:netrw-s-cr|
      Browsing With A Horizontally Split Window...........|netrw-o|
      Browsing With A New Tab.............................|netrw-t|
      Browsing With A Vertically Split Window.............|netrw-v|
@@ -192,21 +193,22 @@ You may do so by placing the following two lines in your <.vimrc>: >

 EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2

-	Protocol  Variable	    Default Value
-	--------  ----------------  -------------
-	   dav:   *g:netrw_dav_cmd*    = "cadaver"    if cadaver is executable
-	   dav:   g:netrw_dav_cmd    = "curl -o"    elseif curl is available
-	 fetch:   *g:netrw_fetch_cmd*  = "fetch -o"   if fetch is available
-	   ftp:   *g:netrw_ftp_cmd*    = "ftp"
-	  http:   *g:netrw_http_cmd*   = "elinks"     if   elinks  is available
-	  http:   g:netrw_http_cmd   = "links"      elseif links is available
-	  http:   g:netrw_http_cmd   = "curl"       elseif curl  is available
-	  http:   g:netrw_http_cmd   = "wget"       elseif wget  is available
-          http:   g:netrw_http_cmd   = "fetch"      elseif fetch is available
-	   rcp:   *g:netrw_rcp_cmd*    = "rcp"
-	 rsync:   *g:netrw_rsync_cmd*  = "rsync -a"
-	   scp:   *g:netrw_scp_cmd*    = "scp -q"
-	  sftp:   *g:netrw_sftp_cmd*   = "sftp"
+	Protocol  Variable	       Default Value
+	--------  ----------------     -------------
+	   dav:   *g:netrw_dav_cmd*      = "cadaver"    if cadaver is executable
+	   dav:   g:netrw_dav_cmd      = "curl -o"    elseif curl is available
+	 fetch:   *g:netrw_fetch_cmd*    = "fetch -o"   if fetch is available
+	   ftp:   *g:netrw_ftp_cmd*      = "ftp"
+	  http:   *g:netrw_http_cmd*     = "elinks"     if   elinks  is available
+	  http:   g:netrw_http_cmd     = "links"      elseif links is available
+	  http:   g:netrw_http_cmd     = "curl"       elseif curl  is available
+	  http:   g:netrw_http_cmd     = "wget"       elseif wget  is available
+          http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
+	  http:   *g:netrw_http_put_cmd* = "curl -T"
+	   rcp:   *g:netrw_rcp_cmd*      = "rcp"
+	 rsync:   *g:netrw_rsync_cmd*    = "rsync -a"
+	   scp:   *g:netrw_scp_cmd*      = "scp -q"
+	  sftp:   *g:netrw_sftp_cmd*     = "sftp"

 	*g:netrw_http_xcmd* : the option string for http://... protocols are
 	specified via this variable and may be independently overridden.  By
@@ -223,6 +225,9 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2
 		let g:netrw_http_xcmd= "-dump >"
 <	in your .vimrc.

+	g:netrw_http_put_cmd: this option specifies both the executable and
+	any needed options.  This command does a PUT operation to the url.
+

 READING						*netrw-read* *netrw-nread* {{{2

@@ -816,8 +821,7 @@ variables listed below, and may be modified by the user.
 			   ------------------------
    Option            Type        Setting         Meaning
    ---------         --------    --------------  ---------------------------
-<
-    netrw_ftp         variable    =doesn't exist  userid set by "user userid"
+<    netrw_ftp         variable    =doesn't exist  userid set by "user userid"
                                  =0              userid set by "user userid"
                                  =1              userid set by "userid"
    NetReadFixup      function    =doesn't exist  no change
@@ -825,17 +829,18 @@ variables listed below, and may be modified by the user.
                                                  read via ftp automatically
                                                  transformed however they wish
                                                  by NetReadFixup()
-    g:netrw_dav_cmd    variable   ="cadaver"      if cadaver  is executable
-    g:netrw_dav_cmd    variable   ="curl -o"      elseif curl is executable
-    g:netrw_fetch_cmd  variable   ="fetch -o"     if fetch is available
-    g:netrw_ftp_cmd    variable   ="ftp"
-    g:netrw_http_cmd   variable   ="fetch -o"     if      fetch is available
-    g:netrw_http_cmd   variable   ="wget -O"      else if wget  is available
-    g:netrw_list_cmd   variable   ="ssh USEPORT HOSTNAME ls -Fa"
-    g:netrw_rcp_cmd    variable   ="rcp"
-    g:netrw_rsync_cmd  variable   ="rsync -a"
-    g:netrw_scp_cmd    variable   ="scp -q"
-    g:netrw_sftp_cmd   variable   ="sftp" >
+    g:netrw_dav_cmd      var   ="cadaver"      if cadaver  is executable
+    g:netrw_dav_cmd      var   ="curl -o"      elseif curl is executable
+    g:netrw_fetch_cmd    var   ="fetch -o"     if fetch is available
+    g:netrw_ftp_cmd      var   ="ftp"
+    g:netrw_http_cmd     var   ="fetch -o"     if      fetch is available
+    g:netrw_http_cmd     var   ="wget -O"      else if wget  is available
+    g:netrw_http_put_cmd var   ="curl -T"
+    g:netrw_list_cmd     var   ="ssh USEPORT HOSTNAME ls -Fa"
+    g:netrw_rcp_cmd      var   ="rcp"
+    g:netrw_rsync_cmd    var   ="rsync -a"
+    g:netrw_scp_cmd      var   ="scp -q"
+    g:netrw_sftp_cmd     var   ="sftp" >
    -------------------------------------------------------------------------
 <
 								*netrw-ftp*
@@ -1097,16 +1102,20 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 			   mapping defined before netrw is autoloaded,
 			then a double clicked leftmouse button will return
 			to the netrw browser window.  See |g:netrw_retmap|.
-	<s-leftmouse>	(gvim only) like mf, will mark files
+	<s-leftmouse>	(gvim only) like mf, will mark files.  Dragging
+			the shifted leftmouse will mark multiple files.
+			(see |netrw-mf|)

 	(to disable mouse buttons while browsing: |g:netrw_mousemaps|)

 				*netrw-quickcom* *netrw-quickcoms*
 QUICK REFERENCE: COMMANDS	*netrw-explore-cmds* *netrw-browse-cmds* {{{2
-     :NetrwClean[!] ...........................................|netrw-clean|
-     :NetrwSettings ...........................................|netrw-settings|
+     :NetrwClean[!]............................................|netrw-clean|
+     :NetrwSettings............................................|netrw-settings|
+     :Ntree....................................................|netrw-ntree|
     :Explore[!]  [dir] Explore directory of current file......|netrw-explore|
     :Hexplore[!] [dir] Horizontal Split & Explore.............|netrw-explore|
+     :Lexplore    [dir] Left Explorer Toggle...................|netrw-explore|
     :Nexplore[!] [dir] Vertical Split & Explore...............|netrw-explore|
     :Pexplore[!] [dir] Vertical Split & Explore...............|netrw-explore|
     :Rexplore          Return to Explorer.....................|netrw-explore|
@@ -1171,6 +1180,12 @@ are introduced into a directory), the listing may become out-of-date.  One may
 always refresh directory listing buffers by pressing ctrl-L (see
 |netrw-ctrl-l|).

+								*:netrw-s-cr*
+    Squeezing the Current Tree-Listing Directory~
+    When the tree listing style is enabled (see |netrw-i|) and one is using
+    gvim, then the <s-cr> mapping may be used to squeeze (close) the
+    directory currently containing the cursor.
+

 Related topics: |netrw-o| |netrw-p| |netrw-P| |netrw-t| |netrw-v|
 Associated setting variables: |g:netrw_browse_split|      |g:netrw_fastbrowse|
@@ -1321,6 +1336,17 @@ See |g:netrw_dirhistmax| for how to control the quantity of history stack
 slots.


+CHANGING TREE TOP				*netrw-ntree* *:Ntree*
+
+One may specify a new tree top for tree listings using >
+
+	:Ntree [dirname]
+
+Without a "dirname", the current line is used (and any leading depth
+information is elided).
+With a "dirname", the specified directory name is used.
+
+
 NETRW CLEAN					*netrw-clean* *:NetrwClean*

 With :NetrwClean one may easily remove netrw from one's home directory;
@@ -1458,35 +1484,52 @@ Associated setting variable: |g:netrw_localrmdir| |g:netrw_rm_cmd|


 *netrw-explore*  *netrw-hexplore* *netrw-nexplore* *netrw-pexplore*
-*netrw-rexplore* *netrw-sexplore* *netrw-texplore* *netrw-vexplore*
+*netrw-rexplore* *netrw-sexplore* *netrw-texplore* *netrw-vexplore* *netrw-lexplore*
 DIRECTORY EXPLORATION COMMANDS  {{{2

     :[N]Explore[!]  [dir]... Explore directory of current file      *:Explore*
     :[N]Hexplore[!] [dir]... Horizontal Split & Explore             *:Hexplore*
-     :Rexplore            ... Return to Explorer                     *:Rexplore*
+     :Rexplore            ... Return to/from Explorer                *:Rexplore*
     :[N]Sexplore[!] [dir]... Split&Explore current file's directory *:Sexplore*
     :Texplore       [dir]... Tab              & Explore             *:Texplore*
     :[N]Vexplore[!] [dir]... Vertical   Split & Explore             *:Vexplore*
+     :Lexplore       [dir]... Left Explorer Toggle                   *:Lexplore*

     Used with :Explore **/pattern : (also see |netrw-starstar|)
     :Nexplore............. go to next matching file                *:Nexplore*
     :Pexplore............. go to previous matching file            *:Pexplore*

+						*netrw-:Explore*
 :Explore  will open the local-directory browser on the current file's
          directory (or on directory [dir] if specified).  The window will be
 	  split only if the file has been modified, otherwise the browsing
 	  window will take over that window.  Normally the splitting is taken
 	  horizontally.
+	  Also see: |netrw-:Rexplore|
 :Explore! is like :Explore, but will use vertical splitting.
+						*netrw-:Lexplore*
+:Lexplore [dir] toggles an Explorer window on the left hand side
+          of the current tab  It will open a netrw window on the current
+	  directory if [dir] is omitted; a :Lexplore [dir] will show
+	  the specified directory in the left-hand side browser display
+	  no matter from which window the command is issued.  By default,
+	  :Lexplore will change an uninitialized |g:netrw_chgwin| to 2;
+	  edits will thus be preferentially made in window#2.
+	  Also see: |netrw-C|| |g:netrw_chgwin| |g:netrw_winsize|
+	  	    |netrw-p| |netrw-P|| |g:netrw_browse_split|
+						*netrw-:Sexplore*
 :Sexplore will always split the window before invoking the local-directory
          browser.  As with Explore, the splitting is normally done
 	  horizontally.
 :Sexplore! [dir] is like :Sexplore, but the splitting will be done vertically.
+						*netrw-:Hexplore*
 :Hexplore  [dir] does an :Explore with |:belowright| horizontal splitting.
 :Hexplore! [dir] does an :Explore with |:aboveleft|  horizontal splitting.
+						*netrw-:Vexplore*
 :Vexplore  [dir] does an :Explore with |:leftabove|  vertical splitting.
 :Vexplore! [dir] does an :Explore with |:rightbelow| vertical splitting.
-:Texplore  [dir] does a tabnew before generating the browser window
+						*netrw-:Texplore*
+:Texplore  [dir] does a |:tabnew| before generating the browser window

 By default, these commands use the current file's directory.  However, one may
 explicitly provide a directory (path) to use.
@@ -1498,12 +1541,24 @@ Otherwise, the |g:netrw_winsize| variable, if it has been specified by the
 user, is used to control the quantity of rows and/or columns new explorer
 windows should have.

-:Rexplore  This command is a little different from the others.  When one
-           edits a file, for example by pressing <cr> when atop a file in
-	   a netrw browser window, :Rexplore will return the display to
-	   that of the last netrw browser window.  It is a command version
-	   of the <2-leftmouse> map (which is only available under gvim and
-	   cooperative terms).
+						*netrw-:Rexplore*
+:Rexplore  This command is a little different from the others as it doesn't
+	   necessarily open an Explorer window.
+
+	   Return to Explorer~
+	   When one edits a file, for example by pressing <cr> when the
+	   cursor is atop a file in a netrw browser window, :Rexplore will
+	   return the display to that of the last netrw browser window.
+
+	   Return from Explorer~
+	   Conversely, when one is editing a directory, issuing a :Rexplore
+	   will return to editing the last file being edited in that
+	   window.
+
+	   The <2-leftmouse> map (which is only available under gvim and
+	   cooperative terms) does the same as :Rexplore.
+
+Also see: |g:netrw_alto| |g:netrw_altv| |g:netrw_winsize|


 *netrw-star* *netrw-starpat* *netrw-starstar* *netrw-starstarpat*
@@ -1547,11 +1602,12 @@ As an example, consider
 The status line will show, on the right hand side of the status line, a
 message like "Match 3 of 20".

-Associated setting variables: |g:netrw_keepdir|      |g:netrw_browse_split|
-                              |g:netrw_fastbrowse|   |g:netrw_ftp_browse_reject|
-			      |g:netrw_ftp_list_cmd| |g:netrw_ftp_sizelist_cmd|
-			      |g:netrw_ftp_timelist_cmd| |g:netrw_list_cmd|
-			      |g:netrw_liststyle|
+Associated setting variables:
+	|g:netrw_keepdir|          |g:netrw_browse_split|
+	|g:netrw_fastbrowse|       |g:netrw_ftp_browse_reject|
+	|g:netrw_ftp_list_cmd|     |g:netrw_ftp_sizelist_cmd|
+	|g:netrw_ftp_timelist_cmd| |g:netrw_list_cmd|
+	|g:netrw_liststyle|


 DISPLAYING INFORMATION ABOUT FILE				*netrw-qf* {{{2
@@ -1641,10 +1697,10 @@ entry in the listing.

 Netrw will use the command in |g:netrw_list_cmd| to perform the directory
 listing operation after changing HOSTNAME to the host specified by the
-user-provided url.  By default netrw provides the command as:
+user-prpvided url.  By default netrw provides the command as: >

 	ssh HOSTNAME ls -FLa
-
+<
 where the HOSTNAME becomes the [user@]hostname as requested by the attempt to
 read.  Naturally, the user may override this command with whatever is
 preferred.  The NetList function which implements remote browsing
@@ -1696,9 +1752,36 @@ As a quick shortcut, one may press >
 to toggle between hiding files which begin with a period (dot) and not hiding
 them.

-Associated setting variable: |g:netrw_list_hide|  |g:netrw_hide|
+Associated setting variables: |g:netrw_list_hide|  |g:netrw_hide|
 Associated topics: |netrw-a| |netrw-ctrl-h| |netrw-mh|

+					*netrw-gitignore*
+Netrw provides a helper function 'netrw_gitignore#Hide()' that, when used with
+|g:netrw_list_hide| automatically hides all git-ignored files.
+
+'netrw_gitignore#Hide' searches for patterns in the following files:
+	'./.gitignore'
+	'./.git/info/exclude'
+	global gitignore file: `git config --global core.excludesfile`
+	system gitignore file: `git config --system core.excludesfile`
+
+Files that do not exist, are ignored.
+Git-ignore patterns are taken from existing files, and converted to patterns for
+hiding files. For example, if you had '*.log' in your '.gitignore' file, it
+would be converted to '.*\.log'.
+
+To use this function, simply assign it's output to |g:netrw_list_hide| option.
+
+	Example: let g:netrw_list_hide= netrw_gitignore#Hide()
+		Git-ignored files are hidden in Netrw.
+
+	Example: let g:netrw_list_hide= netrw_gitignore#Hide('my_gitignore_file')
+		Function can take additional files with git-ignore patterns.
+
+	Example: g:netrw_list_hide= netrw_gitignore#Hide() . '.*\.swp$'
+		Combining 'netrw_gitignore#Hide' with custom patterns.
+
+
 IMPROVING BROWSING			*netrw-listhack* *netrw-ssh-hack* {{{2

 Especially with the remote directory browser, constantly entering the password
@@ -1778,6 +1861,15 @@ passwords:
    http://sial.org/howto/openssh/publickey-auth/


+    Ssh hints:
+
+	Thomer Gil has provided a hint on how to speed up netrw+ssh:
+	    http://thomer.com/howtos/netrw_ssh.html
+
+	Alex Young has several hints on speeding ssh up:
+	    http://usevim.com/2012/03/16/editing-remote-files/
+
+
 LISTING BOOKMARKS AND HISTORY		*netrw-qb* *netrw-listbookmark* {{{2

 Pressing "qb" (query bookmarks) will list both the bookmarked directories and
@@ -1800,8 +1892,8 @@ directory.  Attempts to make a local directory that already exists (as either
 a file or a directory) will be detected, reported on, and ignored.

 Related topics: |netrw-D|
-Associated setting variables:	|g:netrw_localmkdir|  |g:netrw_mkdir_cmd|
-				|g:netrw_remote_mkdir|
+Associated setting variables:	|g:netrw_localmkdir|   |g:netrw_mkdir_cmd|
+				|g:netrw_remote_mkdir| |netrw-%|


 MAKING THE BROWSING DIRECTORY THE CURRENT DIRECTORY	*netrw-c* {{{2
@@ -1821,12 +1913,27 @@ directory.

 Associated setting variable: |g:netrw_keepdir|

-MARKING FILES							*netrw-mf* {{{2
+MARKING FILES					*netrw-:MF*	*netrw-mf* {{{2
 	(also see |netrw-mr|)

-One may mark files with the cursor atop a filename and then pressing "mf".
-With gvim, one may also mark files with <s-leftmouse>.  The following netrw
-maps make use of marked files:
+Netrw has several ways of marking files:
+
+	* One may mark files with the cursor atop a filename and
+	then pressing "mf".
+
+	* With gvim, in addition one may mark files with
+	<s-leftmouse>.
+
+	* One may use the :MF command, which takes a list of
+	files (for local directories, the list may include
+	wildcards -- see |glob()|) >
+
+		:MF *.c
+<
+	* Note that :MF uses |<f-args>| to break the line
+	at spaces.
+
+The following netrw maps make use of marked files:

    |netrw-a|	Hide marked files/directories
    |netrw-D|	Delete marked files/directories
@@ -1835,7 +1942,7 @@ maps make use of marked files:
    |netrw-me|	Edit marked files
    |netrw-mF|	Unmark marked files
    |netrw-mg|	Apply vimgrep to marked files
-    |netrw-mm|	Move marked files
+    |netrw-mm|	Move marked files to target
    |netrw-mp|	Print marked files
    |netrw-mt|	Set target for |netrw-mm| and |netrw-mc|
    |netrw-mT|	Generate tags using marked files
@@ -1860,6 +1967,10 @@ like >
 <
 into $HOME/.vim/after/syntax/netrw.vim .

+If the mouse is enabled and works with your vim, you may use <s-leftmouse> to
+mark one or more files.  You may mark multiple files by dragging the shifted
+leftmouse.  (see |netrw-mouse|)
+
 *markfilelist* *global_markfilelist* *local_markfilelist*
 All marked files are entered onto the global marked file list; there is only
 one such list.  In addition, every netrw buffer also has its own local marked
@@ -1868,6 +1979,12 @@ means that each directory has its own local marked file list.  The various
 commands which operate on marked files use one or the other of the marked file
 lists.

+Known Problem: if one is using tree mode (|g:netrw_liststyle|) and several
+directories have files with the same name,  then marking such a file will
+result in all such files being highlighted as if they were all marked.  The
+|markfilelist|, however, will only have the selected file in it.  This problem
+is unlikely to be fixed.
+

 UNMARKING FILES							*netrw-mF* {{{2
 	(also see |netrw-mf|)
@@ -2025,6 +2142,10 @@ Set the marked file copy/move-to target (see |netrw-mc| and |netrw-mm|):
  * However, if the cursor is atop a directory name, then that directory is
    used for the copy/move-to target

+  * One may use the :MT [directory] command to set the target	*netrw-:MT*
+    This command uses |<q-args>|, so spaces in the directory name are
+    permitted without escaping.
+
 There is only one copy/move-to target per vim session; ie. the target is a
 script variable (see |s:var|) and is shared between all netrw windows (in an
 instance of vim).
@@ -2055,9 +2176,9 @@ http://www.drchip.org/astronaut/src/index.html , and have >
 in my <.vimrc>.

 When a remote set of files are tagged, the resulting tags file is "obtained";
-ie. a copy is transferred to the local system's directory.  The local tags
+ie. a copy is transferred to the local system's directory.  The now local tags
 file is then modified so that one may use it through the network.  The
-modification is concerns the names of the files in the tags; each filename is
+modification made concerns the names of the files in the tags; each filename is
 preceded by the netrw-compatible url used to obtain it.  When one subsequently
 uses one of the go to tag actions (|tags|), the url will be used by netrw to
 edit the desired file and go to the tag.
@@ -2066,34 +2187,38 @@ Associated setting variables: |g:netrw_ctags| |g:netrw_ssh_cmd|

 MARKED FILES: TARGET DIRECTORY USING BOOKMARKS  		*netrw-Tb* {{{2

-Sets the marked file copy/move-to target (see |netrw-mc| and |netrw-mm|).
+Sets the marked file copy/move-to target.

 The |netrw-qb| map will give you a list of bookmarks (and history).
 One may choose one of the bookmarks to become your marked file
 target by using [count]Tb (default count: 1).

 Related topics:
+      Copying files to target............................|netrw-mc|
      Listing Bookmarks and History......................|netrw-qb|
      Marked Files: Setting The Target Directory.........|netrw-mt|
      Marked Files: Target Directory Using History.......|netrw-Th|
      Marking Files......................................|netrw-mf|
      Marking Files by Regular Expression................|netrw-mr|
+      Moving files to target.............................|netrw-mm|


 MARKED FILES: TARGET DIRECTORY USING HISTORY	  		*netrw-Th* {{{2

-Sets the marked file copy/move-to target (see |netrw-mc| and |netrw-mm|).
+Sets the marked file copy/move-to target.

 The |netrw-qb| map will give you a list of history (and bookmarks).
 One may choose one of the history entries to become your marked file
 target by using [count]Th (default count: 0; ie. the current directory).

 Related topics:
+      Copying files to target............................|netrw-mc|
      Listing Bookmarks and History......................|netrw-qb|
      Marked Files: Setting The Target Directory.........|netrw-mt|
      Marked Files: Target Directory Using Bookmarks.....|netrw-Tb|
      Marking Files......................................|netrw-mf|
      Marking Files by Regular Expression................|netrw-mr|
+      Moving files to target.............................|netrw-mm|


 MARKED FILES: UNMARKING						*netrw-mu* {{{2
@@ -2114,7 +2239,15 @@ your browsing preferences.  (see also: |netrw-settings|)
   ---				-----------
   Var				Explanation
   ---				-----------
-< *g:netrw_alto*		change from above splitting to below splitting
+<  *g:netrw_altfile*		some like |CTRL-^| to return to the last
+				edited file.  Choose that by setting this
+				parameter to 1.
+				Others like |CTRL-^| to return to the
+				netrw browsing buffer.  Choose that by setting
+				this parameter to 0.
+				 default: =0
+
+  *g:netrw_alto*		change from above splitting to below splitting
 				by setting this variable (see |netrw-o|)
 				 default: =&sb           (see |'sb'|)

@@ -2142,6 +2275,10 @@ your browsing preferences.  (see also: |netrw-settings|)
 				    to get vertical splitting instead of
 				    horizontal splitting.

+				Related topics:
+					|netrw-cr|	|netrw-C|
+					|g:netrw_alto|	|g:netrw_altv|
+
  *g:netrw_browsex_viewer*	specify user's preference for a viewer: >
 					"kfmclient exec"
 					"gnome-open"
@@ -2205,6 +2342,7 @@ your browsing preferences.  (see also: |netrw-settings|)
  *g:netrw_dynamic_maxfilenamelen* =32: enables dynamic determination of
 				    |g:netrw_maxfilenamelen|, which affects
 				    local file long listing.
+
  *g:netrw_errorlvl*		=0: error levels greater than or equal to
 				    this are permitted to be displayed
 				    0: notes
@@ -2303,10 +2441,19 @@ your browsing preferences.  (see also: |netrw-settings|)
 				     stamp information and file size)
 				= 2: wide listing (multiple files in columns)
 				= 3: tree style listing
+
  *g:netrw_list_hide*		comma separated pattern list for hiding files
 				Patterns are regular expressions (see |regexp|)
-				Example: let g:netrw_list_hide= '.*\.swp$'
-				 default: ""
+				There's some special support for git-ignore
+				files: you may add the output from the helper
+				function 'netrw_gitignore#Hide() automatically
+				hiding all gitignored files.
+				For more details see |netrw-gitignore|.
+
+				Examples:
+				 let g:netrw_list_hide= '.*\.swp$'
+         			 let g:netrw_list_hide= netrw_gitignore#Hide().'.*\.swp$'
+				default: ""

  *g:netrw_localcopycmd*	="cp" Linux/Unix/MacOS/Cygwin
 				="copy" Windows
@@ -2348,7 +2495,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				evaluation will be suppressed
 				(see |'ballooneval'|)

-  *g:netrw_remote_mkdir*	command for making a local directory
+  *g:netrw_remote_mkdir*	command for making a remote directory
 				via ftp  (also see |g:netrw_mkdir_cmd|)
 				 default: "mkdir"

@@ -2396,7 +2543,7 @@ your browsing preferences.  (see also: |netrw-settings|)

  *g:netrw_sort_sequence*	when sorting by name, first sort by the
 				comma-separated pattern sequence.  Note that
-				the filigree added to indicate filetypes
+				any filigree added to indicate filetypes
 				should be accounted for in your pattern.
 				 default: '[\/]$,*,\.bak$,\.o$,\.h$,
 				           \.info$,\.swp$,\.obj$'
@@ -2412,7 +2559,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 					netrwMakefile: [mM]akefile *.mak
 					netrwObj     : *.o *.obj
 					netrwTags    : tags ANmenu ANtags
-					netrwTilde   : *~
+					netrwTilde   : *
 					netrwTmp     : tmp* *tmp

 				These syntax highlighting groups are linked
@@ -2421,8 +2568,27 @@ your browsing preferences.  (see also: |netrw-settings|)
 				one may put lines like >
 					hi link netrwCompress Visual
 <				into one's <.vimrc> to use one's own
-				preferences.
+				preferences.  Alternatively, one may
+				put such specifications into
+				.vim/after/syntax/netrw.vim.

+				As an example, I myself use a dark-background
+				colorscheme with the following in
+				.vim/after/syntax/netrw.vim: >
+
+ hi netrwCompress term=NONE cterm=NONE gui=NONE ctermfg=10 guifg=green  ctermbg=0 guibg=black
+ hi netrwData	  term=NONE cterm=NONE gui=NONE ctermfg=9 guifg=blue ctermbg=0 guibg=black
+ hi netrwHdr	  term=NONE cterm=NONE,italic gui=NONE guifg=SeaGreen1
+ hi netrwLex	  term=NONE cterm=NONE,italic gui=NONE guifg=SeaGreen1
+ hi netrwYacc	  term=NONE cterm=NONE,italic gui=NONE guifg=SeaGreen1
+ hi netrwLib	  term=NONE cterm=NONE gui=NONE ctermfg=14 guifg=yellow
+ hi netrwObj	  term=NONE cterm=NONE gui=NONE ctermfg=12 guifg=red
+ hi netrwTilde	  term=NONE cterm=NONE gui=NONE ctermfg=12 guifg=red
+ hi netrwTmp	  term=NONE cterm=NONE gui=NONE ctermfg=12 guifg=red
+ hi netrwTags	  term=NONE cterm=NONE gui=NONE ctermfg=12 guifg=red
+ hi netrwDoc	  term=NONE cterm=NONE gui=NONE ctermfg=220 ctermbg=27 guifg=yellow2 guibg=Blue3
+ hi netrwSymLink  term=NONE cterm=NONE gui=NONE ctermfg=220 ctermbg=27 guifg=grey60
+<
  *g:netrw_ssh_browse_reject*	ssh can sometimes produce unwanted lines,
 				messages, banners, and whatnot that one doesn't
 				want masquerading as "directories" and "files".
@@ -2457,6 +2623,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				ml_get errors, try putting
 				  let g:netrw_use_noswf= 0
 				in your .vimrc.
+				  default: 1

  *g:netrw_winsize*		specify initial size of new windows made with
 				"o" (see |netrw-o|), "v" (see |netrw-v|),
@@ -2496,7 +2663,7 @@ Netrw has been designed to handle user options by saving them, setting the
 options to something that's compatible with netrw's needs, and then restoring
 them.  However, the autochdir option: >
 	:set acd
-is problematical.  Autochdir sets the current directory to that containing the
+is problematic.  Autochdir sets the current directory to that containing the
 file you edit; this apparently also applies to directories.  In other words,
 autochdir sets the current directory to that containing the "file" (even if
 that "file" is itself a directory).
@@ -2547,9 +2714,11 @@ Related topics:
 							*netrw-createfile*
 OPEN A NEW FILE IN NETRW'S CURRENT DIRECTORY		*netrw-%*

-To open a file in netrw's current directory, press "%".  This map will
-query the user for a new filename; an empty file by that name will be
-placed in the netrw's current directory (ie. b:netrw_curdir).
+To open a new file in netrw's current directory, press "%".  This map
+will query the user for a new filename; an empty file by that name will
+be placed in the netrw's current directory (ie. b:netrw_curdir).
+
+Related topics:               |netrw-d|


 PREVIEW WINDOW				*netrw-p* *netrw-preview* {{{2
@@ -2573,6 +2742,9 @@ These will:
 	   will use only 30% of the columns available; the rest of the window
 	   is used for the preview window.

+Also see: |g:netrw_chgwin| |netrw-P|
+
+
 PREVIOUS WINDOW				*netrw-P* *netrw-prvwin* {{{2

 To edit a file or directory in the previously used (last accessed) window (see
@@ -2592,6 +2764,8 @@ Associated setting variables:
   |g:netrw_preview| control horizontal vs vertical splitting
   |g:netrw_winsize| control initial sizing

+Also see: |g:netrw_chgwin| |netrw-p|
+

 REFRESHING THE LISTING			*netrw-ctrl-l* *netrw-ctrl_l* {{{2

@@ -2629,6 +2803,7 @@ If there are marked files:  (see |netrw-mf|)
    Note that moving files is a dangerous operation; copies are safer.  That's
    because a "move" for remote files is actually a copy + delete -- and if
    the copy fails and the delete does not, you may lose the file.
+    Use at your own risk.

 The g:netrw_rename_cmd variable is used to implement renaming.  By default its
 value is:
@@ -2655,7 +2830,7 @@ One may select a netrw window for editing with the "C" mapping, or by setting
 g:netrw_chgwin to the selected window number.  Subsequent selection of a file
 to edit (|netrw-cr|) will use that window.

-Related topics:			|netrw-cr|
+Related topics:			|netrw-cr| |g:netrw_browse_split|
 Associated setting variables:	|g:netrw_chgwin|


@@ -2742,7 +2917,7 @@ Associated setting variables:	|g:netrw_chgwin|

 		(taken from an answer provided by Wu Yongwei on the vim
 		mailing list)
-		I now see the problem. You code page is not 936, right? Vim
+		I now see the problem. Your code page is not 936, right? Vim
 		seems only able to open files with names that are valid in the
 		current code page, as are many other applications that do not
 		use the Unicode version of Windows APIs. This is an OS-related
@@ -2950,9 +3125,6 @@ The <netrw.vim> script is typically available as something like:
 >
 	/usr/local/share/vim/vim7x/plugin/netrwPlugin.vim
 	/usr/local/share/vim/vim7x/autoload/netrw.vim
-< -or- >
-	/usr/local/share/vim/vim6x/plugin/netrwPlugin.vim
-	/usr/local/share/vim/vim6x/autoload/netrw.vim
 <
 which is loaded automatically at startup (assuming :set nocp).

@@ -2962,9 +3134,7 @@ which is loaded automatically at startup (assuming :set nocp).
 	   or
 	     http://vim.sourceforge.net/scripts/script.php?script_id=120

-	  It now comes as a "vimball"; if you're using vim 7.0 or earlier,
-	  you'll need to update vimball, too.  See
-	     http://www.drchip.org/astronaut/vim/index.html#VIMBALL
+	  Decho.vim is provided as a "vimball"; see |vimball-intro|.

 	2. Edit the <netrw.vim> file by typing: >

@@ -2988,15 +3158,127 @@ which is loaded automatically at startup (assuming :set nocp).
 	   read/write your file over the network in a separate tab.

 	   To save the file, use >
+
 		:tabnext
 		:set bt=
 		:w! DBG
-<	   Please send that information to <netrw.vim>'s maintainer, >
+
+<	   Furthermore, it'd be helpful if you would type >
+		:Dsep <command>
+<	   where <command> is the command you're about to type next,
+	   thereby making it easier to associate which part of the
+	   debugging trace is due to which command.
+
+	   Please send that information to <netrw.vim>'s maintainer along
+	   with the o/s you're using and vim version you're using
+	   (see |:version|) >
 		NdrOchip at ScampbellPfamily.AbizM - NOSPAM
 <
 ==============================================================================
 12. History						*netrw-history* {{{1

+	v151:	Jan 22, 2014	* extended :Rexplore to return to buffer
+				  prior to Explore or editing a directory
+				* (Ken Takata) netrw gave error when
+				  clipboard was disabled.  Sol'n: Placed
+				  several if has("clipboard") tests in.
+				* Fixed ftp://X@Y@Z// problem; X@Y now
+				  part of user id, and only Z is part of
+				  hostname.
+				* (A Loumiotis) reported that completion
+				  using a directory name containing spaces
+				  did not work.  Fixed with a retry in
+				  netrw#Explore() which removes the
+				  backslashes vim inserted.
+		Feb 26, 2014	* :Rexplore now records the current file
+				   using w:netrw_rexfile when returning via
+				  |:Rexplore|
+		Mar 08, 2014	* (David Kotchan) provided some patches
+				  allowing netrw to work properly with
+				  windows shares.
+				* Multiple one-liner help messages available
+				  by pressing <cr> while atop the "Quick
+				  Help" line
+				* worked on ShellCmdPost, FocusGained event
+				  handling.
+				* |:Lexplore| path: will be used to update
+				  a left-side netrw browsing directory.
+		Mar 12, 2014	* |:netrw-s-cr|: use <s-cr>  to close
+				  tree directory implemented
+		Mar 13, 2014	* (Tony Mechylynck) reported that using
+				  the browser with ftp on a directory,
+				  and selecting a gzipped txt file, that
+				  an E19 occurred (which was issued by
+				  gzip.vim).  Fixed.
+		Mar 14, 2014	* Implemented :MF and :MT (see |netrw-:MF|
+				  and |netrw-:MT|, respectively)
+		Mar 17, 2014	* |:Ntree| [dir] wasn't working properly; fixed
+		Mar 18, 2014	* Changed all uses of set to setl
+		Mar 18, 2014	* Commented the netrw_btkeep line in
+				  s:NetrwOptionSave(); the effect is that
+				  netrw buffers will remain as |'bt'|=nofile.
+				  This should prevent swapfiles being created
+				  for netrw buffers.
+		Mar 20, 2014	* Changed all uses of lcd to use s:NetrwLcd()
+				  instead.  Consistent error handling results
+				  and it also handles Window's shares
+				* Fixed |netrw-d| command when applied with ftp
+				* https: support included for netrw#NetRead()
+	v150:	Jul 12, 2013	* removed a "keepalt" to allow ":e #" to
+				  return to the netrw directory listing
+		Jul 13, 2013	* (Jonas Diemer) suggested changing
+				  a <cWORD> to <cfile>.
+		Jul 21, 2013	* (Yuri Kanivetsky) reported that netrw's
+				  use of mkdir did not produce directories
+				  following the user's umask.
+		Aug 27, 2013	* introduced |g:netrw_altfile| option
+		Sep 05, 2013	* s:Strlen() now uses |strdisplaywidth()|
+				  when available, by default
+		Sep 12, 2013	* (Selyano Baldo) reported that netrw wasn't
+				  opening some directories properly from the
+				  command line.
+		Nov 09, 2013	* |:Lexplore| introduced
+				* (Ondrej Platek) reported an issue with
+				  netrw's trees (P15).  Fixed.
+				* (Jorge Solis) reported that "t" in
+				  tree mode caused netrw to forget its
+				  line position.
+		Dec 05, 2013	* Added <s-leftmouse> file marking
+				  (see |netrw-mf|)
+		Dec 05, 2013	* (Yasuhiro Matsumoto) Explore should use
+				  strlen() instead s:Strlen() when handling
+				  multibyte chars with strpart()
+				  (ie. strpart() is byte oriented, not
+				  display-width oriented).
+		Dec 09, 2013	* (Ken Takata) Provided a patch; File sizes
+				  and a portion of timestamps were wrongly
+				  highlighted with the directory color when
+				  setting `:let g:netrw_liststyle=1` on Windows.
+				* (Paul Domaskis) noted that sometimes
+				  cursorline was activating in non-netrw
+				  windows.  All but one setting of cursorline
+				  was done via setl; there was one that was
+				  overlooked.  Fixed.
+		Dec 24, 2013	* (esquifit) asked that netrw allow the
+				  /cygdrive prefix be a user-alterable
+				  parameter.
+		Jan 02, 2014	* Fixed a problem with netrw-based ballon
+				  evaluation (ie. netrw#NetrwBaloonHelp()
+				  not having been loaded error messages)
+		Jan 03, 2014	* Fixed a problem with tree listings
+				* New command installed: |:Ntree|
+		Jan 06, 2014	* (Ivan Brennan) reported a problem with
+				  |netrw-P|.  Fixed.
+		Jan 06, 2014	* Fixed a problem with |netrw-P| when the
+				  modified file was to be abandoned.
+		Jan 15, 2014	* (Matteo Cavalleri) reported that when the
+				  banner is suppressed and tree listing is
+				  used, a blank line was left at the top of
+				  the display.  Fixed.
+		Jan 20, 2014	* (Gideon Go) reported that, in tree listing
+				  style, with a previous window open, that
+				  the wrong directory was being used to open
+				  a file.  Fixed. (P21)
 	v149:	Apr 18, 2013	* in wide listing format, now have maps for
 				  w and b to move to next/previous file
 		Apr 26, 2013	* one may now copy files in the same
@@ -3009,7 +3291,8 @@ which is loaded automatically at startup (assuming :set nocp).
 		May 01, 2013	* :Explore ftp://... wasn't working.  Fixed.
 		May 02, 2013	* introduced |g:netrw_bannerbackslash| as
 				  requested by Paul Domaskis.
-		May 18, 2013	* More fixes for windows (not cygwin)
+		Jul 03, 2013	* Explore now avoids splitting when a buffer
+				  will be hidden.
 	v148:	Apr 16, 2013	* changed Netrw's Style menu to allow direct
 				  choice of listing style, hiding style, and
 				  sorting style
@@ -1,4 +1,4 @@
-*pi_paren.txt*  For Vim version 7.4a.  Last change: 2013 May 08
+*pi_paren.txt*  For Vim version 7.4.  Last change: 2013 May 08


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.4a.  Last change: 2006 Apr 24
+*pi_spec.txt*   For Vim version 7.4.  Last change: 2006 Apr 24

 by Gustavo Niemeyer ~

@@ -1,4 +1,4 @@
-*pi_tar.txt*	For Vim version 7.4a.  Last change: 2013 Apr 17
+*pi_tar.txt*	For Vim version 7.4.  Last change: 2013 Apr 17

 		       +====================+
 		       | Tar File Interface |
@@ -1,4 +1,4 @@
-*pi_vimball.txt*	For Vim version 7.4a.  Last change: 2012 Jan 17
+*pi_vimball.txt*	For Vim version 7.4.  Last change: 2012 Jan 17

 			       ----------------
 			       Vimball Archiver
@@ -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 Brabrandt) :so someplugin.vba and
+	32 : May 19, 2010 * (Christian Brabandt) :so someplugin.vba and
 			    :so someplugin.vba.gz (and the other supported
 			    compression types) now works
 			  * (Jan Steffens) added support for xz compression
--- a/Show More
+++ b/Show More