Changeset 21a5e24

Timestamp:

Aug 4, 2013, 7:18:46 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

ecf65a0

Parents:

622dedff

Message:

Add vim 7.3 branch update 8 patch.

File:

• patches/vim-7.3-branch_update-8.patch (moved) (moved from patches/vim-7.3-branch_update-7.patch ) (3790 diffs)

patches/vim-7.3-branch_update-8.patch

@@ -1 +1 @@
 Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 2013-06-07
+Date: 2013-08-04
 Initial Package Version: 7.3
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.3.1140.
+Description: Contains all upstream patches up to 7.3.1314.
 
 diff -Naur vim73.orig/.hg_archival.txt vim73/.hg_archival.txt
 --- vim73.orig/.hg_archival.txt 1970-01-01 00:00:00.000000000 +0000
-+++ vim73/.hg_archival.txt      2013-06-07 17:07:05.315660159 +0000
++++ vim73/.hg_archival.txt      2013-08-04 19:09:07.480619939 +0000
 @@ -0,0 +1,5 @@
 +repo: 770908d1cb47c04be0aef5c173b17ab8be6b6476
-+node: 6a602c36cb7c5b3af71fb242f8b9ac6fe3afd779
++node: 29e57603bf6f3a2e3c178a63d332ed4d2eccfa82
 +branch: default
-+latesttag: v7-3-1140
-+latesttagdistance: 1
++latesttag: v7-3-1313
++latesttagdistance: 2
 diff -Naur vim73.orig/.hgignore vim73/.hgignore
 --- vim73.orig/.hgignore        1970-01-01 00:00:00.000000000 +0000
-+++ vim73/.hgignore     2013-06-07 17:07:05.368993340 +0000
-@@ -0,0 +1,56 @@
++++ vim73/.hgignore     2013-08-04 19:09:07.490619909 +0000
+@@ -0,0 +1,61 @@
 +syntax: glob
 +
@@ -59 +59 @@
 +gvimext.lib
 +
++# Mac OSX
++src/xxd/xxd.dSYM
++
 +# All platforms
 +*.rej
@@ -65 +68 @@
 +*.swp
 +*~
++*.pyc
 +src/po/vim.pot
 +
@@ -75 +79 @@
 +src/testdir/tiny.vim 
 +src/testdir/test*.out
++src/testdir/test.log
 diff -Naur vim73.orig/.hgtags vim73/.hgtags
 --- vim73.orig/.hgtags  1970-01-01 00:00:00.000000000 +0000
-+++ vim73/.hgtags       2013-06-07 17:07:05.388993283 +0000
-@@ -0,0 +1,2479 @@
++++ vim73/.hgtags       2013-08-04 19:09:07.507286525 +0000
+@@ -0,0 +1,2652 @@
 +004eb98eb3c30714cb6a24ec3e810275080a8413 v7-1-117
 +006e9c8a6a8ad354a5cb6adcce6ebfceddeb20ee v7-0079
@@ -2558 +2563 @@
 +3b5a023a45434e825b8dbeed551cf7f4578243f6 v7-3-1139
 +7fde662e1db24077abbe26e6d78c286928f5c9b6 v7-3-1140
++10673b3531ebcc18467d04bb806036cbee1b8e2b v7-3-1141
++65cef998f860b3745880622cba74135bfa249ae2 v7-3-1142
++66e849c4558aca6c522026882159b41994d0c0c1 v7-3-1143
++8360a59aa04b8668e377a66d1fc46e9e52b35110 v7-3-1144
++a30e3762957d61966152040315d160f860433576 v7-3-1145
++e3f9e33fb28c367aac7b2270b6fd304fd755b6d4 v7-3-1146
++3cd3cc1e91193a0b45e6aff1373cd4802e595a16 v7-3-1147
++220bdea4f57919c290d92b1f6c83a7252cd660b6 v7-3-1148
++66803af09906a828b9f41d7ae0f7a379137eaf99 v7-3-1149
++3dbd251777de232c168d87650acda5fec408146c v7-3-1150
++4d7e3df04256790855f7a6dc289f32ffc04da133 v7-3-1151
++9909e44879b9f80679fd05af19a423b2673b2301 v7-3-1152
++bc3f4804cf470cec5773d8842743efb760f69102 v7-3-1153
++6419ee8098c80f0418081c73b790b09c61f13c3a v7-3-1154
++bf1e6326df1104cabc04b8490f9456dbda901fd2 v7-3-1155
++8c4324e6f4779ee316361511ff783f6344750be9 v7-3-1156
++2f1ee97f5f23a5f9e1c572ed4afb50fb79ce7a35 v7-3-1157
++46077370bc605815f5e41cbfc925120a913acbaa v7-3-1158
++208a6c04e6b8221c1f5187391d86c5b57e61445b v7-3-1159
++60301d4d16827a961019d72a78e811f41326c680 v7-3-1160
++ff393592644960783e9a1c7c7959a8cbb0954673 v7-3-1161
++b8eabb6a96871321bec8526fa04ba1ff1a96780e v7-3-1162
++70b1178dec7919120632cdeee6056e38108356a7 v7-3-1163
++4db0bf9f1b44d1f0d42a1863732dfaef73c9971d v7-3-1164
++05b8436873d48055cbd24f043548092755d77be7 v7-3-1165
++d59ff2114733a526847ea38d093897f496f73ffc v7-3-1166
++81dedcd648216d6b3fc6b967368fef23d8ee1154 v7-3-1167
++ed47632fd1498d50e31ab5b30aac403de3db2496 v7-3-1168
++a83fb2bd8c8ea8865f460f7d82d8ebff8202cced v7-3-1169
++14c2e63caec65cca0d315e82f90b5e1d84430487 v7-3-1170
++fc7f985df53745d157182585b01ee5dadb722a62 v7-3-1171
++96e154e825a7441274a615e7d7fdbe68e5534ee9 v7-3-1172
++b584d361e7461c79728585f16f408984b0234fdd v7-3-1173
++52850ef928f85755f005267c1f02fe9e9f898c99 v7-3-1174
++84a8d1ba81c393dcc3a45eb3b20fb6ac5f18df7b v7-3-1175
++e48cabe984537b06cfa945926844c4af96799331 v7-3-1176
++e79a20f07daa91051435208887cc31b245555046 v7-3-1177
++c4d4f0fc12b9b8665d6859680155797be960c36f v7-3-1178
++d84833983de7708de27774e3f01e7ffc8c03eec6 v7-3-1179
++04b8912a9c85e72728a2cd6a4f8e6aee82525b31 v7-3-1180
++b7bb20390111b75616eb66558aa9517901eb0144 v7-3-1181
++fa98c2b030ed5ac8d8c8139405d20ad6c611c065 v7-3-1182
++044d23a64c177549b4b5e3183642f3a5b286d14f v7-3-1183
++9e36c6b1ebf4554a24bd879965f348b81ad5ca6a v7-3-1184
++6d935f45c489b346f06aef5b1bdd87cb98b8400b v7-3-1185
++7b8991e084f9bea2dde9ceef7a245254d656b6f9 v7-3-1186
++fefd8d33a7ea43f86d6e5a2ab30440140ada14f6 v7-3-1187
++6f7ed9b799a3db282f0fc076d8232752716a4e00 v7-3-1188
++dc78a26f6f64bb1330b9027559ce0c8fe54ba1de v7-3-1189
++25d64a4edc0b0f3f17330a7b12f3c1ca141ccfb3 v7-3-1190
++4c42efb4c0982d305ec9ee99bb3bddfaeec2cf87 v7-3-1191
++07b9c48a30e973833ee70d38633934f6fc2177d8 v7-3-1192
++8b46c37c4b843039e5a543be98978e79ff6f3d31 v7-3-1193
++91136a41f83f3716e7ccb4f2402216ea215a4acf v7-3-1194
++4837fd61be52d420c69fcde0621cd5ecc298d2b6 v7-3-1195
++56fbf60e94766a202ee71749eea19a862695c92f v7-3-1196
++2fc1f3346bfb3229f35455101a5944e6785a02af v7-3-1197
++517fa1a34c7cf1c8fb04d43976ad6c381f48cebd v7-3-1198
++be2973afe77045bd749c63c46ea02f61efa55862 v7-3-1199
++2945fe016b936c9e3a89db48692495c83f1843a1 v7-3-1200
++d8f65e6238fa2bac706f1a4868e8d38ad71ded64 v7-3-1201
++1707ddb6f5aed99b69fff8a66dc3eb8ab40d7f46 v7-3-1202
++ba328b4a990ee460cc907ec59aabee8d872b7768 v7-3-1203
++0792cc5133ce1f37ad9e1d49804100b28d0a391b v7-3-1204
++d02448031708fca0df590f46f850e33acc9f9651 v7-3-1205
++8dd2769ab75c07d88feb49d1dd489a1282854217 v7-3-1206
++6ae32a64e153d7275058d965e0c1c12d106bc7de v7-3-1207
++784e342ddcaeb260ffaab5f0dd30ec5db832842e v7-3-1208
++afb00cc8caacb8969705ffae0316bb9c01156e7f v7-3-1209
++7155782d94fb88e47e252b159dd677c31a3f14e8 v7-3-1210
++1cf02fbe6281c8efe63f866470b6c44d5835125c v7-3-1211
++81e623ff2e554695c372b7b06bd826c6298bb8b5 v7-3-1212
++ae05437a744a3b6f87d6f3304a19e5256849bb1c v7-3-1213
++bcb84438bb5bf27101b25ffb2c2267ab6ff0e946 v7-3-1214
++8bbd0ff486b3cfa711e0a7f305b4a0241bd5dd52 v7-3-1215
++b89aa3374b7fe64968421f4e20cf22cd3e95713b v7-3-1216
++613651492c1905f62cbbcbfc616d7935234badab v7-3-1217
++d10ede931224a9818a98a58bd9382f77728ced1b v7-3-1218
++eb5c3508cd7da14f8d3337ca4dfabe4122ded20c v7-3-1219
++ba7db05e1482457a36b19ed608f820275fafb9f7 v7-3-1220
++9f7b92f232d31450fd04ecec3e89b027c0f28b02 v7-3-1221
++07831d280e90a87ab9f42a9c96775ef2bc0cdedf v7-3-1222
++5cd32322154c1c5970194eb5300eec2ddb8ccc30 v7-3-1223
++0a379dea13c97df4ec2ba1487dd50c1e8ba0c912 v7-3-1224
++27b008d5b7ac5fab02c6934b87f258bc4715aed6 v7-3-1225
++b34d719b13cd9dd44485600e5cd939814b9b065f v7-3-1226
++5cee875f30961cf1adadf386b7e2764ea8aeeb64 v7-3-1227
++620d9b59d4ed9deaac614c707c71257907b1dd21 v7-3-1228
++b6e693e1f9461e5020e4cafa1c6e1de24776e11b v7-3-1229
++f5c822e5a0eba6f490d0be9f6892de929295be87 v7-3-1230
++537bbfff0c5c0bc2307a85133f59f07b00c55e41 v7-3-1231
++a594ce86b5eade96cb84415b3b027abe611c2238 v7-3-1232
++4ed713442c51625160cd0bca612d9a3417e4ba14 v7-3-1233
++f4969f8f66e974584e8e7815d0a262c5dca79638 v7-3-1234
++9ae0fe46777674504e0f372e68cfb8e0be81b2ee v7-3-1235
++39980afcf54aafdb9255424adf5808af45ab2242 v7-3-1236
++5b2c8f3b390632e1e57a3839f040146f6798a969 v7-3-1237
++048c69ebe8eecb218320030d9ea41fe4f6290848 v7-3-1238
++e130cc3d17af412971143b8420d6e7b1cbd13ff2 v7-3-1239
++bc9125136c69a4feecb4b68912fa04380f42b77f v7-3-1240
++c8747604696795a300f6ff05091813d691f9a488 v7-3-1241
++b4a2eaf28b51327b4e56b4eacf4b5d72a52560f6 v7-3-1242
++8a7d3a73adabaad5e9fe079acf6431982145c7d1 v7-3-1243
++b4a71dbdb78790ca423103ad5deb71b1df9b5b04 v7-3-1244
++43329b2b5b79ed2e1017869ee2e0b1caeaf2f0f6 v7-3-1245
++a1b41dabc682ed8f8770a12c2d3a227eb348885b v7-3-1246
++f451d60ab8ec56d02a7b5f2d5c16187566279886 v7-3-1247
++3717d569027d8ec8b62e42e33f91333ac22ce6ba v7-3-1248
++b614332f7df2f6f471bb4bd93767becd7844b90c v7-3-1249
++6aecf486bb347ac6885afe36d62ddbbf2457f898 v7-3-1250
++788f4802967766b7f3d6dce83cc027baef422f4a v7-3-1251
++875a0aeb301c3fb2be8a79f2d82e324d80caf4f3 v7-3-1252
++d6a7dea44a8667d834e463b8658cf85ea938112d v7-3-1253
++5eff37e92f03771aee77a3688d79a73e5b6107e9 v7-3-1254
++f8d307ebd74a4097f7083ea8117be0433f00c7ce v7-3-1255
++322441058afca6a8aa52d34eda9fa307608354d3 v7-3-1256
++5751284311f37399cb7a66d99fe317de4ae86ea9 v7-3-1257
++c9e2ccc53f2e119e247da7fc9111b6b9c9385d93 v7-3-1258
++7ab94cb688bebd694109442be4dd6edb6ebe3c85 v7-3-1259
++7aa4e0822dec0840770d9f41052a772a887cd213 v7-3-1260
++1cf89d38aa7628b55f1a45a5325adc83abe85dc2 v7-3-1261
++5e0b6a9282df8b9435da372cad77482f1f5b20aa v7-3-1262
++a02575cd564ade1019ea89db07c1c1d0c4b5418c v7-3-1263
++558c815e1a38d7ac2fc61c4155aabf8e81a14034 v7-3-1264
++53c1b30632df47993bc00947078dd31a226c9a97 v7-3-1265
++bbe4bd64c68c64afaa6636e8c3e9a9a6241e91cb v7-3-1266
++cabdcfe72dc398fd67bbbe02cff5e11e4dc2506e v7-3-1267
++72fcf674e545eb87bb4ea996df56e4eb7c04f6cc v7-3-1268
++350239b0e9eb063d9f84dfa4bc7a2b47d78e9afb v7-3-1269
++35b6fc57a2868b235284d914820da0815e62d54b v7-3-1270
++034abed357a1a2fabe624ed59ea49ebdec09d790 v7-3-1271
++a00cd1839ac4f3467e1e51e619b4c65ce4e0ee81 v7-3-1272
++30910831e5b0f0eb28a8eea7412f5ec9f3533ab2 v7-3-1273
++761cef8f5d1d42e315fb85765ee90857981fec06 v7-3-1274
++8875401008da99a39878478a293f833f68481ffc v7-3-1275
++d2f9f67924e77ec3d90164dd6ff2e50c5107faf0 v7-3-1276
++6a7ae677d6a1f116b685fa0f892052e20003eaad v7-3-1277
++cf52d2a8c05cd037c049abef0f58fd918146f3bb v7-3-1278
++cca600e6092839efeb3795db863916959921bb0e v7-3-1279
++1cacf785299e771ca463c493c8c870e395c09cd0 v7-3-1280
++19ed30f7cef76224ef39ceadefb64387eb986342 v7-3-1281
++22ac43fb6d30ad1097d0c7e8937b28efcb162137 v7-3-1282
++d6ceddc0be86e46a5a9a696e36c54b9d133f2203 v7-3-1283
++7b20dc8041645778eeb2f7823a4c1c647f735d24 v7-3-1284
++14e7a115d54d2c095f31ccda2d04fbcf775dacde v7-3-1285
++6ddc1785c4ff3779c18f5c313da591a052388b2d v7-3-1286
++34c629c3b4bab5fc755e83869d929f8cb322bfcd v7-3-1287
++8b7baf39a345aecf00a6116b5da211b51c6e3457 v7-3-1288
++1ed945570d47e9a60694ed1ef3a5b208243657e9 v7-3-1289
++08d4c11cdaed2c5d95e2c0be3b0df91d01f52b84 v7-3-1290
++a6ddcab6a240d22f965c4961bb93ddfea6a74c73 v7-3-1291
++cad8d29b0bc0356a49a455296e5e79eb6f38139d v7-3-1292
++18b43970fb7a796ab740e65baa4ff2ba46f929a8 v7-3-1293
++11d0c6df1d7bdc399b34a8cc70f354d6ee908661 v7-3-1294
++93cccad6a26b439728bf3c155ed5532001a2f2ab v7-3-1295
++c3a82208e143e4cd4a3b9d9b1716eb9d876bf462 v7-3-1296
++cb0a5c9c0f9bcc6c5a18ed97762206309d3e334c v7-3-1297
++dafd77a15d44cced4e405a9fcfe67fc48a02004a v7-3-1298
++f063be86b6323f396e6d3a7be73e860e636eb51d v7-3-1299
++56bc3698f8c6ac275a9a05b64ae056de619d226b v7-3-1300
++6cabac58f26fe9d8b608542d9fdbfed3fc437c90 v7-3-1301
++5569d11ef585033ef40e4402cd6a52453e4d13d9 v7-3-1302
++6e611380b4cf586f210de94d92a4f158b6900a5f v7-3-1303
++46d6318d5b965b77278ea252b25209468214dd2d v7-3-1304
++6f24376028af97c93b426cdbd46379795be7cdfd v7-3-1305
++71859e71b1f902c28b8842bc7092dd155b8c7f88 v7-3-1306
++3dafc80e781b8d5ed12d6107a2c804067aeafd90 v7-3-1307
++71e066e10a4789eeb9553aa08f9ca8e7eec96532 v7-3-1308
++a686295448918b7066bc52e3fd9748e6702c2219 v7-3-1309
++b49784c49d537fabe083cc3f8cc460629bb6957f v7-3-1310
++28e6f5f889683fe161b7bc260bd02b742157fc5b v7-3-1311
++80bab8b1a30db72b7eda880b0442ab0b0f4a1611 v7-3-1312
++afbc9dd67cea81e73d64f7ecce47dfcd35d48865 v7-3-1313
 diff -Naur vim73.orig/Filelist vim73/Filelist
 --- vim73.orig/Filelist 2010-08-07 11:04:57.000000000 +0000
-+++ vim73/Filelist      2013-06-07 17:07:05.425659845 +0000
++++ vim73/Filelist      2013-08-04 19:09:07.513953172 +0000
 @@ -39,6 +39,7 @@
                 src/mark.c \
@@ -2585 +2763 @@
                 src/xxd/xxd.c \
                 src/main.aap \
-@@ -80,6 +83,7 @@
+@@ -80,6 +83,16 @@
                 src/testdir/test[0-9]*.ok \
                 src/testdir/test49.vim \
                 src/testdir/test60.vim \
 +               src/testdir/test83-tags? \
++               src/testdir/python2/*.py \
++               src/testdir/python3/*.py \
++               src/testdir/pythonx/*.py \
++               src/testdir/pythonx/topmodule/__init__.py \
++               src/testdir/pythonx/topmodule/submodule/__init__.py \
++               src/testdir/pythonx/topmodule/submodule/subsubmodule/__init__.py \
++               src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py \
++               src/testdir/python_after/*.py \
++               src/testdir/python_before/*.py \
                 src/proto.h \
                 src/proto/blowfish.pro \
                 src/proto/buffer.pro \
-@@ -128,6 +132,7 @@
+@@ -128,6 +141,7 @@
                 src/proto/ui.pro \
                 src/proto/undo.pro \
@@ -2601 +2788 @@
  
  
-@@ -259,8 +264,10 @@
+@@ -259,8 +273,10 @@
                 src/Make_mvc.mak \
                 src/Make_w16.mak \
@@ -2612 +2799 @@
                 src/dlldata.c \
                 src/dosinst.c \
-@@ -311,6 +318,7 @@
+@@ -311,6 +327,7 @@
                 src/xxd/Make_bc5.mak \
                 src/xxd/Make_cyg.mak \
@@ -2620 +2807 @@
                 nsis/gvim.nsi \
                 nsis/README.txt \
-@@ -345,6 +353,13 @@
+@@ -345,6 +362,13 @@
                 src/vim*.ico \
                 src/vim.tlb \
@@ -2634 +2821 @@
                 nsis/icons/*.bmp \
                 nsis/icons/*.ico \
-@@ -426,20 +441,14 @@
+@@ -426,20 +450,14 @@
                 $(SRC_VMS) \
                 README_os390.txt \
@@ -2656 +2843 @@
                 src/toolbar.phi \
  
-@@ -466,6 +475,7 @@
+@@ -466,6 +484,7 @@
                 runtime/macros/hanoi/hanoi.vim \
                 runtime/macros/hanoi/poster \
@@ -2664 +2851 @@
                 runtime/macros/less.vim \
                 runtime/macros/life/click.me \
-@@ -669,6 +679,8 @@
+@@ -669,6 +688,8 @@
  
  # generic language files
@@ -2673 +2860 @@
                 runtime/doc/*-fr.UTF-8.1 \
                 runtime/doc/*-it.1 \
-@@ -685,7 +697,17 @@
+@@ -685,7 +706,17 @@
                 runtime/tutor/Makefile \
                 runtime/tutor/tutor.utf-8 \
@@ -2694 +2881 @@
 diff -Naur vim73.orig/Makefile vim73/Makefile
 --- vim73.orig/Makefile 2010-08-15 12:23:34.000000000 +0000
-+++ vim73/Makefile      2013-06-07 17:07:05.432326493 +0000
++++ vim73/Makefile      2013-08-04 19:09:07.517286495 +0000
 @@ -23,6 +23,9 @@
  # has run can result in compiling with $(CC) empty.
@@ -2715 +2902 @@
         @echo "If there are problems, cd to the src directory and run make there"
         cd src && $(MAKE) $@
+@@ -122,36 +128,20 @@
+ # PC:
+ # - Run make on Unix to update the ".mo" files.
+ # - "make dossrc" and "make dosrt".  Unpack the archives on a PC.
+-# 16 bit DOS version: (OBSOLETE, 16 bit version doesn't build)
+-# - Set environment for compiling with Borland C++ 3.1.
+-# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
+-#   case set environment for compiling with Borland C++ 4.0 and do
+-#   "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
+-#   NOTE: this currently fails because Vim is too big.
+-# - "make test" and check the output.
+-# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
+-#   "uninstald16.exe".
+-# 32 bit DOS version:
+-# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
+-# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
+-#   "ALL DONE".
+-# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
+-#   "uninstald32.exe".
+ # Win32 console version:
+-# - Set environment for Visual C++ 2008, e.g.:
+-#   "E:\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat".  Or, when using the
+-#   Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the paths when necessary).
+-#   For Windows 98/ME the 2003 version is required, but then it won't work on
+-#   Windows 7 and 64 bit.
+-# - "nmake -f Make_mvc.mak"
++# - Set environment for Visual C++ 2008, e.g.: "msvc2008.bat"  Or:
++#   "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat".
++#   Or, when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the
++#   paths when necessary).
++#   For Windows 98/ME the 2003 version is required, but then the executable
++#   won't work on Windows 7 and 64 bit.
++# - "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 the executables to "vimw32.exe", "xxdw32.exe".
++# - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
+ # - Rename vim.pdb to vimw32.pdb.
+-# - When building the Win32s version later, delete vimrun.exe, install.exe and
+-#   uninstal.exe.  Otherwise rename executables to installw32.exe and
+-#   uninstalw32.exe.
++# - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
+ # Win32 GUI version:
+-# - "nmake -f Make_mvc.mak GUI=yes.
++# - "nmake -f Make_mvc.mak GUI=yes"
+ # - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
+ # - Move gvim.pdb to here.
+ # - Delete vimrun.exe, install.exe and uninstal.exe.
+@@ -161,23 +151,13 @@
+ # - Rename "gvim.exe" to "gvim_ole.exe".
+ # - Rename gvim.pdb to "gvim_ole.pdb".
+ # - Delete install.exe and uninstal.exe.
+-# - If building the Win32s version delete vimrun.exe.
+-# Win32s GUI version:
+-# - Set environment for Visual C++ 4.1 (requires a new console window):
+-#   "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
+-# - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
+-# - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
+-# - Rename "gvim.exe" to "gvim_w32s.exe".
+-# - Rename "install.exe" to "installw32.exe"
+-# - Rename "uninstal.exe" to "uninstalw32.exe"
+-# - The produced uninstalw32.exe and vimrun.exe are used.
+ # Create the archives:
+ # - Copy all the "*.exe" files to where this Makefile is.
+ # - Copy all the "*.pdb" files to where this Makefile is.
+ # - "make dosbin".
+ # NSIS self installing exe:
+ # - To get NSIS see http://nsis.sourceforge.net
+-# - Make sure gvim_ole.exe, vimd32.exe, vimw32.exe, installw32.exe,
++# - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
+ #   uninstalw32.exe and xxdw32.exe have been build as mentioned above.
+ # - copy these files (get them from a binary archive or build them):
+ #      gvimext.dll in src/GvimExt
+@@ -190,7 +170,44 @@
+ # - go to ../nsis and do "makensis gvim.nsi" (takes a few minutes).
+ # - Copy gvim##.exe to the dist directory.
+ #
+-# OS/2: (OBSOLETE, OS/2 version is no longer distributed)
++# 64 bit builds (these are not in the normal distribution, the 32 bit build
++# works just fine on 64 bit systems).
++# Like the console and GUI version, but first run vcvars64.bat or
++#   "..\VC\vcvarsall.bat x86_amd64".
++# - "nmake -f Make_mvc.mak"
++# - "nmake -f Make_mvc.mak GUI=yes"
++# Or run src/bigvim64.bat for an OLE version.
++#
++# OBSOLETE systems: You can build this if you have an appropriate system.
++#
++# 16 bit DOS version: (doesn't build anywhere)
++# - Set environment for compiling with Borland C++ 3.1.
++# - "bmake -f Make_bc3.mak BOR=E:\borlandc" (compiling xxd might fail, in that
++#   case set environment for compiling with Borland C++ 4.0 and do
++#   "make -f make_bc3.mak BOR=E:\BC4 xxd/xxd.exe").
++#   NOTE: this currently fails because Vim is too big.
++# - "make test" and check the output.
++# - Rename the executables to "vimd16.exe", "xxdd16.exe", "installd16.exe" and
++#   "uninstald16.exe".
++#
++# 32 bit DOS version: (requires Windows XP or earlier)
++# - Set environment for compiling with DJGPP; "gmake -f Make_djg.mak".
++# - "rm testdir/*.out", "gmake -f Make_djg.mak test" and check the output for
++#   "ALL DONE".
++# - Rename the executables to "vimd32.exe", "xxdd32.exe", "installd32.exe" and
++#   "uninstald32.exe".
++#
++# Win32s GUI version: (requires very old compiler)
++# - Set environment for Visual C++ 4.1 (requires a new console window):
++#   "vcvars32.bat" (use the path for VC 4.1 e:\msdev\bin)
++# - "nmake -f Make_mvc.mak GUI=yes INTL=no clean" (use the path for VC 4.1)
++# - "nmake -f Make_mvc.mak GUI=yes INTL=no" (use the path for VC 4.1)
++# - Rename "gvim.exe" to "gvim_w32s.exe".
++# - Rename "install.exe" to "installw32.exe"
++# - Rename "uninstal.exe" to "uninstalw32.exe"
++# - The produced uninstalw32.exe and vimrun.exe are used.
++#
++# OS/2: (requires an OS/2 system)
+ # - Unpack the Unix archive.
+ # - "make -f Make_os2.mak".
+ # - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy
+@@ -289,6 +306,8 @@
+                $(LANG_SRC) \
+                | (cd dist/$(VIMRTDIR); tar xf -)
+ # Need to use a "distclean" config.mk file
++# Note: this file is not included in the repository to avoid problems, but it's
++# OK to put it in the archive.
+        cp -f src/config.mk.dist dist/$(VIMRTDIR)/src/auto/config.mk
+ # Create an empty config.h file, make dependencies require it
+        touch dist/$(VIMRTDIR)/src/auto/config.h
 diff -Naur vim73.orig/README.txt vim73/README.txt
 --- vim73.orig/README.txt       2010-08-15 12:23:19.000000000 +0000
-+++ vim73/README.txt    2013-06-07 17:07:05.462326407 +0000
++++ vim73/README.txt    2013-08-04 19:09:07.517286495 +0000
 @@ -97,10 +97,12 @@
  If you have problems, have a look at the Vim FAQ:
@@ -2736 +3050 @@
 diff -Naur vim73.orig/README_extra.txt vim73/README_extra.txt
 --- vim73.orig/README_extra.txt 2010-08-15 12:23:19.000000000 +0000
-+++ vim73/README_extra.txt      2013-06-07 17:07:05.605659331 +0000
++++ vim73/README_extra.txt      2013-08-04 19:09:07.530619788 +0000
 @@ -13,9 +13,6 @@
  
@@ -2747 +3061 @@
  src/os_beos.*          Files for the BeOS port.
  
+diff -Naur vim73.orig/nsis/gvim.nsi vim73/nsis/gvim.nsi
+--- vim73.orig/nsis/gvim.nsi    2010-08-15 12:23:23.000000000 +0000
++++ vim73/nsis/gvim.nsi 2013-08-04 19:09:07.557286375 +0000
+@@ -5,7 +5,7 @@
+ # WARNING: if you make changes to this script, look out for $0 to be valid,
+ # because uninstall deletes most files in $0.
+ 
+-# Location of gvim_ole.exe, vimd32.exe, GvimExt/*, etc.
++# Location of gvim_ole.exe, vimw32.exe, GvimExt/*, etc.
+ !define VIMSRC "..\src"
+ 
+ # Location of runtime files
+@@ -40,7 +40,7 @@
+ ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer."
+ DirText "Choose a directory to install Vim (must end in 'vim')"
+ Icon icons\vim_16c.ico
+-# NSIS2 uses a different strategy with six diferent images in a strip...
++# NSIS2 uses a different strategy with six different images in a strip...
+ #EnabledBitmap icons\enabled.bmp
+ #DisabledBitmap icons\disabled.bmp
+ UninstallText "This will uninstall Vim ${VER_MAJOR}.${VER_MINOR} from your system."
+@@ -56,6 +56,9 @@
+   !packhdr temp.dat "upx --best --compress-icons=1 temp.dat"
+ !endif
+ 
++SetCompressor /SOLID lzma
++XPStyle on
++
+ # This adds '\vim' to the user choice automagically.  The actual value is
+ # obtained below with ReadINIStr.
+ InstallDir "$PROGRAMFILES\Vim"
+@@ -247,11 +250,10 @@
+        ReadRegStr $R0 HKLM \
+           "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+        IfErrors 0 lbl_winnt
+-           # Windows 95/98/ME
+-           File /oname=vim.exe ${VIMSRC}\vimd32.exe
++           # Windows 95/98/ME: not supported
+            Goto lbl_done
+        lbl_winnt:
+-           # Windows NT/2000/XT
++           # Windows NT/2000/XP and later
+            File /oname=vim.exe ${VIMSRC}\vimw32.exe
+        lbl_done:
+        StrCpy $2 "$2 vim view vimdiff"
 diff -Naur vim73.orig/runtime/autoload/ada.vim vim73/runtime/autoload/ada.vim
 --- vim73.orig/runtime/autoload/ada.vim 2010-05-15 11:03:31.000000000 +0000
-+++ vim73/runtime/autoload/ada.vim      2013-06-07 17:07:06.515656734 +0000
++++ vim73/runtime/autoload/ada.vim      2013-08-04 19:09:07.603952901 +0000
 @@ -29,6 +29,8 @@
  if version < 700
@@ -2771 +3130 @@
 diff -Naur vim73.orig/runtime/autoload/ccomplete.vim vim73/runtime/autoload/ccomplete.vim
 --- vim73.orig/runtime/autoload/ccomplete.vim   2010-05-15 11:03:31.000000000 +0000
-+++ vim73/runtime/autoload/ccomplete.vim        2013-06-07 17:07:06.532323353 +0000
++++ vim73/runtime/autoload/ccomplete.vim        2013-08-04 19:09:07.607286224 +0000
 @@ -1,8 +1,10 @@
  " Vim completion script
@@ -2802 +3161 @@
 diff -Naur vim73.orig/runtime/autoload/clojurecomplete.vim vim73/runtime/autoload/clojurecomplete.vim
 --- vim73.orig/runtime/autoload/clojurecomplete.vim     1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/autoload/clojurecomplete.vim  2013-06-07 17:07:06.545656648 +0000
++++ vim73/runtime/autoload/clojurecomplete.vim  2013-08-04 19:09:07.607286224 +0000
 @@ -0,0 +1,20 @@
 +" Vim completion script
@@ -2826 +3185 @@
 diff -Naur vim73.orig/runtime/autoload/getscript.vim vim73/runtime/autoload/getscript.vim
 --- vim73.orig/runtime/autoload/getscript.vim   2010-05-15 11:03:31.000000000 +0000
-+++ vim73/runtime/autoload/getscript.vim        2013-06-07 17:07:06.592323181 +0000
++++ vim73/runtime/autoload/getscript.vim        2013-08-04 19:09:07.613952871 +0000
 @@ -1,8 +1,8 @@
  " ---------------------------------------------------------------------
@@ -2943 +3302 @@
 diff -Naur vim73.orig/runtime/autoload/htmlcomplete.vim vim73/runtime/autoload/htmlcomplete.vim
 --- vim73.orig/runtime/autoload/htmlcomplete.vim        2010-05-15 11:03:31.000000000 +0000
-+++ vim73/runtime/autoload/htmlcomplete.vim     2013-06-07 17:07:06.638989715 +0000
++++ vim73/runtime/autoload/htmlcomplete.vim     2013-08-04 19:09:07.617286194 +0000
 @@ -1,7 +1,7 @@
  " Vim completion script
@@ -2963 +3322 @@
 diff -Naur vim73.orig/runtime/autoload/netrw.vim vim73/runtime/autoload/netrw.vim
 --- vim73.orig/runtime/autoload/netrw.vim       2010-07-27 14:55:00.000000000 +0000
-+++ vim73/runtime/autoload/netrw.vim    2013-06-07 17:07:06.742322753 +0000
++++ vim73/runtime/autoload/netrw.vim    2013-08-04 19:09:07.633952811 +0000
 @@ -1,10 +1,10 @@
  " netrw.vim: Handles file transfer and remote directory listing across
@@ -15327 +15686 @@
 diff -Naur vim73.orig/runtime/autoload/netrwFileHandlers.vim vim73/runtime/autoload/netrwFileHandlers.vim
 --- vim73.orig/runtime/autoload/netrwFileHandlers.vim   2010-05-15 11:03:30.000000000 +0000
-+++ vim73/runtime/autoload/netrwFileHandlers.vim        2013-06-07 17:07:06.775655991 +0000
++++ vim73/runtime/autoload/netrwFileHandlers.vim        2013-08-04 19:09:07.633952811 +0000
 @@ -1,9 +1,9 @@
  " netrwFileHandlers: contains various extension-based file handlers for
@@ -15401 +15760 @@
 diff -Naur vim73.orig/runtime/autoload/netrwSettings.vim vim73/runtime/autoload/netrwSettings.vim
 --- vim73.orig/runtime/autoload/netrwSettings.vim       2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/autoload/netrwSettings.vim    2013-06-07 17:07:06.792322610 +0000
++++ vim73/runtime/autoload/netrwSettings.vim    2013-08-04 19:09:07.637286134 +0000
 @@ -1,8 +1,8 @@
  " netrwSettings.vim: makes netrw settings simpler
@@ -15534 +15893 @@
 diff -Naur vim73.orig/runtime/autoload/phpcomplete.vim vim73/runtime/autoload/phpcomplete.vim
 --- vim73.orig/runtime/autoload/phpcomplete.vim 2010-05-15 11:03:30.000000000 +0000
-+++ vim73/runtime/autoload/phpcomplete.vim      2013-06-07 17:07:06.818989201 +0000
++++ vim73/runtime/autoload/phpcomplete.vim      2013-08-04 19:09:07.643952781 +0000
 @@ -1,7 +1,7 @@
  " Vim completion script
@@ -15562 +15921 @@
                 let classlocation = phpcomplete#GetClassLocation(extends_class)
                 if filereadable(classlocation)
+diff -Naur vim73.orig/runtime/autoload/rubycomplete.vim vim73/runtime/autoload/rubycomplete.vim
+--- vim73.orig/runtime/autoload/rubycomplete.vim        2010-05-27 13:54:35.000000000 +0000
++++ vim73/runtime/autoload/rubycomplete.vim     2013-08-04 19:09:07.650619427 +0000
+@@ -1,9 +1,7 @@
+ " Vim completion script
+ " Language:             Ruby
+ " Maintainer:           Mark Guzman <segfault@hasno.info>
+-" Last Change:          2009 Sep 28
+-" URL:                  http://vim-ruby.rubyforge.org
+-" Anon CVS:             See above site
++" URL:                  https://github.com/vim-ruby/vim-ruby
+ " Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
+ " Maintainer Version:   0.8.1
+ " ----------------------------------------------------------------------------
+@@ -12,16 +10,23 @@
+ " ----------------------------------------------------------------------------
+ 
+ " {{{ requirement checks
++
++function! s:ErrMsg(msg)
++    echohl ErrorMsg
++    echo a:msg
++    echohl None
++endfunction
++
+ if !has('ruby')
+-    s:ErrMsg( "Error: Rubycomplete requires vim compiled with +ruby" )
+-    s:ErrMsg( "Error: falling back to syntax completion" )
++    call s:ErrMsg( "Error: Rubycomplete requires vim compiled with +ruby" )
++    call s:ErrMsg( "Error: falling back to syntax completion" )
+     " lets fall back to syntax completion
+     setlocal omnifunc=syntaxcomplete#Complete
+     finish
+ endif
+ 
+ if version < 700
+-    s:ErrMsg( "Error: Required vim >= 7.0" )
++    call s:ErrMsg( "Error: Required vim >= 7.0" )
+     finish
+ endif
+ " }}} requirement checks
+@@ -51,12 +56,6 @@
+ " {{{ vim-side support functions
+ let s:rubycomplete_debug = 0
+ 
+-function! s:ErrMsg(msg)
+-    echohl ErrorMsg
+-    echo a:msg
+-    echohl None
+-endfunction
+-
+ function! s:dprint(msg)
+     if s:rubycomplete_debug == 1
+         echom a:msg
+@@ -133,7 +132,7 @@
+     let stopline = 1
+     let vtp = ''
+     let pos = getpos('.')
+-    let sstr = '^\s*#\s*@var\s*'.a:v.'\>\s\+[^ \t]\+\s*$'
++    let sstr = '^\s*#\s*@var\s*'.escape(a:v, '*').'\>\s\+[^ \t]\+\s*$'
+     let [lnum,lcol] = searchpos(sstr,'nb',stopline)
+     if lnum != 0 && lcol != 0
+         call setpos('.',pos)
+@@ -275,7 +274,7 @@
+     pare = /^\s*class\s*(.*)\s*<\s*(.*)\s*\n/.match( classdef )
+     load_buffer_class( $2 ) if pare != nil  && $2 != name # load parent class if needed
+ 
+-    mixre = /.*\n\s*include\s*(.*)\s*\n/.match( classdef )
++    mixre = /.*\n\s*(include|prepend)\s*(.*)\s*\n/.match( classdef )
+     load_buffer_module( $2 ) if mixre != nil && $2 != name # load mixins if needed
+ 
+     begin
+@@ -364,6 +363,10 @@
+     print txt if @@debug
+   end
+ 
++  def escape_vim_singlequote_string(str)
++    str.to_s.gsub(/'/,"\\'")
++  end
++
+   def get_buffer_entity_list( type )
+     # this will be a little expensive.
+     loading_allowed = VIM::evaluate("exists('g:rubycomplete_buffer_loading') && g:rubycomplete_buffer_loading")
+@@ -526,9 +529,9 @@
+   end
+ 
+   def clean_sel(sel, msg)
+-    sel.delete_if { |x| x == nil }
+-    sel.uniq!
+-    sel.grep(/^#{Regexp.quote(msg)}/) if msg != nil
++    ret = sel.reject{|x|x.nil?}.uniq
++    ret = ret.grep(/^#{Regexp.quote(msg)}/) if msg != nil
++    ret
+   end
+ 
+   def get_rails_view_methods
+@@ -767,10 +770,10 @@
+     constants = clean_sel( constants, message )
+ 
+     valid = []
+-    valid += methods.collect { |m| { :name => m, :type => 'm' } }
+-    valid += variables.collect { |v| { :name => v, :type => 'v' } }
+-    valid += classes.collect { |c| { :name => c, :type => 't' } }
+-    valid += constants.collect { |d| { :name => d, :type => 'd' } }
++    valid += methods.collect { |m| { :name => m.to_s, :type => 'm' } }
++    valid += variables.collect { |v| { :name => v.to_s, :type => 'v' } }
++    valid += classes.collect { |c| { :name => c.to_s, :type => 't' } }
++    valid += constants.collect { |d| { :name => d.to_s, :type => 'd' } }
+     valid.sort! { |x,y| x[:name] <=> y[:name] }
+ 
+     outp = ""
+@@ -779,7 +782,7 @@
+     rg.step(150) do |x|
+       stpos = 0+x
+       enpos = 150+x
+-      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ] }
++      valid[stpos..enpos].each { |c| outp += "{'word':'%s','item':'%s','kind':'%s'}," % [ c[:name], c[:name], c[:type] ].map{|x|escape_vim_singlequote_string(x)} }
+       outp.sub!(/,$/, '')
+ 
+       VIM::command("call extend(g:rubycomplete_completions, [%s])" % outp)
 diff -Naur vim73.orig/runtime/autoload/spellfile.vim vim73/runtime/autoload/spellfile.vim
 --- vim73.orig/runtime/autoload/spellfile.vim   2010-05-15 11:03:31.000000000 +0000
-+++ vim73/runtime/autoload/spellfile.vim        2013-06-07 17:07:06.878989030 +0000
++++ vim73/runtime/autoload/spellfile.vim        2013-08-04 19:09:07.650619427 +0000
 @@ -1,6 +1,6 @@
  " Vim script to download a missing spell file
@@ -15601 +16080 @@
 diff -Naur vim73.orig/runtime/autoload/sqlcomplete.vim vim73/runtime/autoload/sqlcomplete.vim
 --- vim73.orig/runtime/autoload/sqlcomplete.vim 2010-08-01 13:55:41.000000000 +0000
-+++ vim73/runtime/autoload/sqlcomplete.vim      2013-06-07 17:07:06.892322325 +0000
++++ vim73/runtime/autoload/sqlcomplete.vim      2013-08-04 19:09:07.653952751 +0000
 @@ -1,16 +1,63 @@
  " Vim OMNI completion script for SQL
@@ -16326 +16805 @@
 diff -Naur vim73.orig/runtime/autoload/syntaxcomplete.vim vim73/runtime/autoload/syntaxcomplete.vim
 --- vim73.orig/runtime/autoload/syntaxcomplete.vim      2010-07-29 19:21:15.000000000 +0000
-+++ vim73/runtime/autoload/syntaxcomplete.vim   2013-06-07 17:07:06.905655620 +0000
++++ vim73/runtime/autoload/syntaxcomplete.vim   2013-08-04 19:09:07.653952751 +0000
 @@ -1,38 +1,80 @@
  " Vim completion script
@@ -17043 +17522 @@
 diff -Naur vim73.orig/runtime/autoload/tar.vim vim73/runtime/autoload/tar.vim
 --- vim73.orig/runtime/autoload/tar.vim 2010-08-10 00:02:24.000000000 +0000
-+++ vim73/runtime/autoload/tar.vim      2013-06-07 17:07:06.915655592 +0000
++++ vim73/runtime/autoload/tar.vim      2013-08-04 19:09:07.657286074 +0000
 @@ -1,13 +1,13 @@
  " tar.vim: Handles browsing tarfiles
@@ -17301 +17780 @@
 diff -Naur vim73.orig/runtime/autoload/tohtml.vim vim73/runtime/autoload/tohtml.vim
 --- vim73.orig/runtime/autoload/tohtml.vim      2010-08-12 19:59:40.000000000 +0000
-+++ vim73/runtime/autoload/tohtml.vim   2013-06-07 17:07:06.928988887 +0000
++++ vim73/runtime/autoload/tohtml.vim   2013-08-04 19:09:07.657286074 +0000
 @@ -1,6 +1,6 @@
  " Vim autoload file for the tohtml plugin.
  " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
 -" Last Change: 2010 Aug 12
-+" Last Change: 2013 May 31
++" Last Change: 2013 Jun 19
  "
  " Additional contributors:
@@ -17682 +18161 @@
 -  call add(html, '<table border="1" width="100%">')
 +  if !empty(s:settings.prevent_copy)
-+    call add(html, "<body onload='FixCharWidth(); JumpToLine();'>")
++    call add(html, "<body onload='FixCharWidth();".(s:settings.line_ids ? " JumpToLine();" : "")."'>")
 +    call add(html, "<!-- hidden divs used by javascript to get the width of a char -->")
 +    call add(html, "<div id='oneCharWidth'>0</div>")
@@ -17688 +18167 @@
 +    call add(html, "<div id='oneEmWidth' style='width: 1em;'></div>")
 +  else
-+    call add(html, '<body onload="JumpToLine();">')
++    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
 +  endif
-+  call add(html, "<table border='1' width='100%' id='vimCodeElement'>")
++  call add(html, "<table border='1' width='100%' id='vimCodeElement".s:settings.id_suffix."'>")
  
    call add(html, '<tr>')
@@ -17728 +18207 @@
 +    " clean out id on the main content container because we already set it on
 +    " the table
-+    let temp[0] = substitute(temp[0], " id='vimCodeElement'", "", "")
++    let temp[0] = substitute(temp[0], " id='vimCodeElement[^']*'", "", "")
      " undo deletion of start and end part
      " so we can later save the file as valid html
@@ -17800 +18279 @@
 +           \ '  if (inputWidth > goodWidth) {',
 +           \ '    while (ratio < 100*goodWidth/emWidth && ratio < 100) {',
-+           \ '    ratio += 5;',
-+           \ '  }',
-+           \ '  document.getElementById("vimCodeElement").className = "em"+ratio;',
++           \ '      ratio += 5;',
++           \ '    }',
++           \ '    document.getElementById("vimCodeElement'.s:settings.id_suffix.'").className = "em"+ratio;',
 +           \ '  }',
 +           \ '}'
@@ -17828 +18307 @@
 +           \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
 +           \ "  var node = lineElem;",
-+           \ "  while (node && node.id != 'vimCodeElement')",
++           \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
 +           \ "  {",
 +           \ "    if (node.className == 'closed-fold')",
@@ -17925 +18404 @@
      " just restore the known options if we've already retrieved them
      return s:settings
-@@ -289,21 +707,24 @@
+@@ -289,21 +707,25 @@
        let g:html_use_xhtml = g:use_xhtml
      endif
@@ -17957 +18436 @@
 +    call tohtml#GetOption(user_settings,   'whole_filler', 0 )
 +    call tohtml#GetOption(user_settings,      'use_xhtml', 0 )
++    call tohtml#GetOption(user_settings,       'line_ids', user_settings.number_lines )
 +    " }}}
      
@@ -17964 +18444 @@
      " hover opening implies dynamic folding
      if user_settings.hover_unfold
-@@ -324,6 +745,8 @@
+@@ -324,6 +746,8 @@
      " dynamic folding implies css
      if user_settings.dynamic_folds
@@ -17973 +18453 @@
  
      " if we're not using CSS we cannot use a pre section because <font> tags
-@@ -332,47 +755,154 @@
+@@ -332,47 +756,168 @@
        let user_settings.no_pre = 1
      endif
@@ -18025 +18505 @@
 +         let user_settings.encoding = '' " trigger detection using &encoding
 +       endif
++      endif
++
++      " else from 'encoding' if possible
++      if &l:fileencoding == '' || user_settings.encoding == ''
++       let user_settings.vim_encoding = &encoding
++       call tohtml#CharsetFromEncoding(user_settings)
        endif
 -      if vim_encoding == 'latin1'
@@ -18045 +18531 @@
 -       let user_settings.encoding = 'GBK'
 -      elseif vim_encoding =~ '^ucs\|^utf'
-+
-+      " else from 'encoding' if possible
-+      if &l:fileencoding == '' || user_settings.encoding == ''
-+       let user_settings.vim_encoding = &encoding
-+       call tohtml#CharsetFromEncoding(user_settings)
-+      endif
 +
 +      " else default to UTF-8 and warn user
@@ -18101 +18581 @@
 +      let user_settings.no_invalid = 0
 +    endif
++
++    if exists('g:html_id_expr')
++      let user_settings.id_suffix = eval(g:html_id_expr)
++      if user_settings.id_suffix !~ '^[-_:.A-Za-z0-9]*$'
++       echohl WarningMsg
++       echomsg '2html: g:html_id_expr evaluated to invalid string for HTML id attributes'
++       echomsg '2html: Omitting user-specified suffix'
++       echohl None
++       sleep 3
++       let user_settings.id_suffix=""
++      endif
++    else
++      let user_settings.id_suffix=""
++    endif
  
      " TODO: font
@@ -18157 +18651 @@
 diff -Naur vim73.orig/runtime/autoload/vimball.vim vim73/runtime/autoload/vimball.vim
 --- vim73.orig/runtime/autoload/vimball.vim     2010-05-15 11:03:30.000000000 +0000
-+++ vim73/runtime/autoload/vimball.vim  2013-06-07 17:07:06.945655506 +0000
++++ vim73/runtime/autoload/vimball.vim  2013-08-04 19:09:07.660619397 +0000
 @@ -1,9 +1,9 @@
  " vimball.vim : construct a file containing both paths and files
@@ -18478 +18972 @@
  " Modelines: {{{1
  " vim: fdm=marker
+diff -Naur vim73.orig/runtime/autoload/xmlcomplete.vim vim73/runtime/autoload/xmlcomplete.vim
+--- vim73.orig/runtime/autoload/xmlcomplete.vim 2010-05-15 11:03:31.000000000 +0000
++++ vim73/runtime/autoload/xmlcomplete.vim      2013-08-04 19:09:07.683952660 +0000
+@@ -1,7 +1,7 @@
+ " Vim completion script
+ " Language:    XML
+ " Maintainer:  Mikolaj Machowski ( mikmach AT wp DOT pl )
+-" Last Change: 2006 Aug 15
++" Last Change: 2013 Jun 29
+ " Version: 1.9
+ "
+ " Changelog:
+@@ -475,12 +475,12 @@
+ endfunction
+ 
+ function! s:SetKeywords()
+-       let g:IsKeywordBak=&iskeyword
+-       let &iskeyword='33-255'
++       let s:IsKeywordBak=&l:iskeyword
++       let &l:iskeyword='33-255'
+ endfunction
+ 
+ function! s:RestoreKeywords()
+-       let &iskeyword=g:IsKeywordBak
++       let &l:iskeyword=s:IsKeywordBak
+ endfunction
+ 
+ function! s:Push(el, sname)
 diff -Naur vim73.orig/runtime/autoload/zip.vim vim73/runtime/autoload/zip.vim
 --- vim73.orig/runtime/autoload/zip.vim 2010-05-15 11:03:30.000000000 +0000
-+++ vim73/runtime/autoload/zip.vim      2013-06-07 17:07:07.148988259 +0000
++++ vim73/runtime/autoload/zip.vim      2013-08-04 19:09:07.683952660 +0000
 @@ -1,10 +1,10 @@
  " zip.vim: Handles browsing zipfiles
@@ -18487 +19009 @@
 -" Version:     23
 -" Maintainer:  Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
-+" Date:                Apr 17, 2013
-+" Version:     26
++" Date:                Jul 02, 2013
++" Version:     27
 +" Maintainer:  Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
  " License:     Vim License  (see vim's :help license)
 -" Copyright:    Copyright (C) 2005-2008 Charles E. Campbell, Jr. {{{1
-+" Copyright:    Copyright (C) 2005-2012 Charles E. Campbell {{{1
++" Copyright:    Copyright (C) 2005-2013 Charles E. Campbell {{{1
  "               Permission is hereby granted to use and distribute this code,
  "               with or without modifications, provided that this copyright
  "               notice is copied with it. Like anything else that's free,
-@@ -19,7 +19,7 @@
+@@ -13,13 +13,14 @@
+ "               this plugin, you agree that in no event will the copyright
+ "               holder be liable for any damages resulting from the use
+ "               of this software.
++"redraw!|call DechoSep()|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+ 
+ " ---------------------------------------------------------------------
+ " Load Once: {{{1
  if &cp || exists("g:loaded_zip")
   finish
  endif
 -let g:loaded_zip= "v23"
-+let g:loaded_zip= "v26"
++let g:loaded_zip= "v27"
  if v:version < 702
   echohl WarningMsg
   echo "***warning*** this version of zip needs vim 7.2"
-@@ -103,38 +103,26 @@
+@@ -28,6 +29,7 @@
+ endif
+ let s:keepcpo= &cpo
+ set cpo&vim
++"DechoTabOn
+ 
+ let s:zipfile_escape = ' ?&;\'
+ let s:ERROR          = 2
+@@ -60,6 +62,16 @@
+ " zip#Browse: {{{2
+ fun! zip#Browse(zipfile)
+ "  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
++  " sanity check: insure that the zipfile has "PK" as its first two letters
++  "               (zipped files have a leading PK as a "magic cookie")
++  if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
++   exe "noautocmd e ".fnameescape(a:zipfile)
++"   call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
++   return
++"  else        " Decho
++"   call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file")
++  endif
++
+   let repkeep= &report
+   set report=10
+ 
+@@ -103,38 +115,26 @@
    set ft=tar
  
@@ -18552 +19106 @@
    setlocal noma nomod ro
    noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
-@@ -200,16 +188,27 @@
+@@ -200,16 +200,28 @@
    else
     let zipfile = substitute(a:fname,'^.\{-}zipfile:\(.\{-}\)::[^\\].*$','\1','')
@@ -18568 +19122 @@
 +  " but allows zipfile:... entries in quickfix lists
 +  let temp = tempname()
++"  call Decho("using temp file<".temp.">")
 +  let fn   = expand('%:p')
 +  exe "sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1).' > '.temp
@@ -18580 +19135 @@
    " cleanup
 -  0d
-+  keepj 0d
++  "  keepj 0d   " used to be needed for the ...r! ... method
    set nomod
  
    let &report= repkeep
-@@ -278,7 +277,7 @@
+@@ -278,7 +290,7 @@
  
    if fname =~ '/'
@@ -18593 +19148 @@
     endif
  "   call Decho("mkdir(dirpath<".dirpath.">,p)")
-@@ -290,7 +289,7 @@
+@@ -290,7 +302,7 @@
  "  call Decho("zipfile<".zipfile."> fname<".fname.">")
  
@@ -18604 +19159 @@
 diff -Naur vim73.orig/runtime/colors/koehler.vim vim73/runtime/colors/koehler.vim
 --- vim73.orig/runtime/colors/koehler.vim       2010-05-15 11:03:31.000000000 +0000
-+++ vim73/runtime/colors/koehler.vim    2013-06-07 17:07:07.305654478 +0000
++++ vim73/runtime/colors/koehler.vim    2013-08-04 19:09:07.697285954 +0000
 @@ -2,7 +2,7 @@
  " vim: tw=0 ts=4 sw=4
@@ -18625 +19180 @@
 diff -Naur vim73.orig/runtime/colors/ron.vim vim73/runtime/colors/ron.vim
 --- vim73.orig/runtime/colors/ron.vim   2010-05-15 11:03:31.000000000 +0000
-+++ vim73/runtime/colors/ron.vim        2013-06-07 17:07:07.348987688 +0000
++++ vim73/runtime/colors/ron.vim        2013-08-04 19:09:07.700619277 +0000
 @@ -2,7 +2,7 @@
  " vim: tw=0 ts=4 sw=4
@@ -18664 +19219 @@
 diff -Naur vim73.orig/runtime/compiler/cs.vim vim73/runtime/compiler/cs.vim
 --- vim73.orig/runtime/compiler/cs.vim  2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/cs.vim       2013-06-07 17:07:07.458987374 +0000
++++ vim73/runtime/compiler/cs.vim       2013-08-04 19:09:07.710619247 +0000
 @@ -1,19 +1,26 @@
  " Vim compiler file
@@ -18699 +19254 @@
 diff -Naur vim73.orig/runtime/compiler/decada.vim vim73/runtime/compiler/decada.vim
 --- vim73.orig/runtime/compiler/decada.vim      2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/decada.vim   2013-06-07 17:07:07.485653965 +0000
++++ vim73/runtime/compiler/decada.vim   2013-08-04 19:09:07.713952570 +0000
 @@ -15,11 +15,11 @@
  "    Help Page: compiler-decada
@@ -18727 +19282 @@
 diff -Naur vim73.orig/runtime/compiler/erlang.vim vim73/runtime/compiler/erlang.vim
 --- vim73.orig/runtime/compiler/erlang.vim      1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/erlang.vim   2013-06-07 17:07:07.515653879 +0000
++++ vim73/runtime/compiler/erlang.vim   2013-08-04 19:09:07.717285894 +0000
 @@ -0,0 +1,13 @@
 +" Vim compiler file
@@ -18742 +19297 @@
 +
 +CompilerSet errorformat=%f:%l:\ %m
+diff -Naur vim73.orig/runtime/compiler/eruby.vim vim73/runtime/compiler/eruby.vim
+--- vim73.orig/runtime/compiler/eruby.vim       2010-05-27 20:14:24.000000000 +0000
++++ vim73/runtime/compiler/eruby.vim    2013-08-04 19:09:07.717285894 +0000
+@@ -1,9 +1,7 @@
+ " Vim compiler file
+ " Language:            eRuby
+ " Maintainer:          Doug Kearns <dougkearns@gmail.com>
+-" Last Change:         2008 Aug 1
+-" URL:                 http://vim-ruby.rubyforge.org
+-" Anon CVS:            See above site
++" URL:                 https://github.com/vim-ruby/vim-ruby
+ " Release Coordinator: Doug Kearns <dougkearns@gmail.com>
+ 
+ if exists("current_compiler")
 diff -Naur vim73.orig/runtime/compiler/g95.vim vim73/runtime/compiler/g95.vim
 --- vim73.orig/runtime/compiler/g95.vim 1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/g95.vim      2013-06-07 17:07:07.602320298 +0000
++++ vim73/runtime/compiler/g95.vim      2013-08-04 19:09:07.723952540 +0000
 @@ -0,0 +1,28 @@
 +" Compiler: G95
@@ -18776 +19345 @@
 diff -Naur vim73.orig/runtime/compiler/gcc.vim vim73/runtime/compiler/gcc.vim
 --- vim73.orig/runtime/compiler/gcc.vim 2010-05-30 15:24:23.000000000 +0000
-+++ vim73/runtime/compiler/gcc.vim      2013-06-07 17:07:07.618986917 +0000
++++ vim73/runtime/compiler/gcc.vim      2013-08-04 19:09:07.727285863 +0000
 @@ -1,7 +1,7 @@
  " Vim compiler file
@@ -18810 +19379 @@
 diff -Naur vim73.orig/runtime/compiler/gfortran.vim vim73/runtime/compiler/gfortran.vim
 --- vim73.orig/runtime/compiler/gfortran.vim    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/gfortran.vim 2013-06-07 17:07:07.632320213 +0000
++++ vim73/runtime/compiler/gfortran.vim 2013-08-04 19:09:07.727285863 +0000
 @@ -0,0 +1,27 @@
 +" Compiler: GNU Fortran Compiler
@@ -18841 +19410 @@
 diff -Naur vim73.orig/runtime/compiler/gnat.vim vim73/runtime/compiler/gnat.vim
 --- vim73.orig/runtime/compiler/gnat.vim        2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/gnat.vim     2013-06-07 17:07:07.648986832 +0000
++++ vim73/runtime/compiler/gnat.vim     2013-08-04 19:09:07.727285863 +0000
 @@ -17,11 +17,11 @@
  "    Help Page: compiler-gnat
@@ -18869 +19438 @@
 diff -Naur vim73.orig/runtime/compiler/haml.vim vim73/runtime/compiler/haml.vim
 --- vim73.orig/runtime/compiler/haml.vim        1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/haml.vim     2013-06-07 17:07:07.652320155 +0000
++++ vim73/runtime/compiler/haml.vim     2013-08-04 19:09:07.727285863 +0000
 @@ -0,0 +1,28 @@
 +" Vim compiler file
@@ -18901 +19470 @@
 diff -Naur vim73.orig/runtime/compiler/hp_acc.vim vim73/runtime/compiler/hp_acc.vim
 --- vim73.orig/runtime/compiler/hp_acc.vim      2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/hp_acc.vim   2013-06-07 17:07:07.712319984 +0000
++++ vim73/runtime/compiler/hp_acc.vim   2013-08-04 19:09:07.730619187 +0000
 @@ -2,7 +2,7 @@
  " Compiler:    HP aCC
@@ -18930 +19499 @@
 diff -Naur vim73.orig/runtime/compiler/ifort.vim vim73/runtime/compiler/ifort.vim
 --- vim73.orig/runtime/compiler/ifort.vim       1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/ifort.vim    2013-06-07 17:07:07.762319841 +0000
++++ vim73/runtime/compiler/ifort.vim    2013-08-04 19:09:07.730619187 +0000
 @@ -0,0 +1,27 @@
 +" Compiler: Intel Fortran Compiler
@@ -18961 +19530 @@
 diff -Naur vim73.orig/runtime/compiler/intel.vim vim73/runtime/compiler/intel.vim
 --- vim73.orig/runtime/compiler/intel.vim       2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/intel.vim    2013-06-07 17:07:07.768986489 +0000
++++ vim73/runtime/compiler/intel.vim    2013-08-04 19:09:07.733952510 +0000
 @@ -1,12 +1,14 @@
  " Vim compiler file
@@ -18987 +19556 @@
 diff -Naur vim73.orig/runtime/compiler/irix5_c.vim vim73/runtime/compiler/irix5_c.vim
 --- vim73.orig/runtime/compiler/irix5_c.vim     2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/irix5_c.vim  2013-06-07 17:07:07.778986461 +0000
++++ vim73/runtime/compiler/irix5_c.vim  2013-08-04 19:09:07.733952510 +0000
 @@ -1,12 +1,14 @@
  " Vim compiler file
@@ -19013 +19582 @@
 diff -Naur vim73.orig/runtime/compiler/irix5_cpp.vim vim73/runtime/compiler/irix5_cpp.vim
 --- vim73.orig/runtime/compiler/irix5_cpp.vim   2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/irix5_cpp.vim        2013-06-07 17:07:07.795653080 +0000
++++ vim73/runtime/compiler/irix5_cpp.vim        2013-08-04 19:09:07.733952510 +0000
 @@ -1,12 +1,14 @@
  " Vim compiler file
@@ -19039 +19608 @@
 diff -Naur vim73.orig/runtime/compiler/mcs.vim vim73/runtime/compiler/mcs.vim
 --- vim73.orig/runtime/compiler/mcs.vim 2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/mcs.vim      2013-06-07 17:07:07.822319670 +0000
++++ vim73/runtime/compiler/mcs.vim      2013-08-04 19:09:07.737285833 +0000
 @@ -1,7 +1,8 @@
  " Vim compiler file
@@ -19072 +19641 @@
 diff -Naur vim73.orig/runtime/compiler/mips_c.vim vim73/runtime/compiler/mips_c.vim
 --- vim73.orig/runtime/compiler/mips_c.vim      2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/mips_c.vim   2013-06-07 17:07:07.852319585 +0000
++++ vim73/runtime/compiler/mips_c.vim   2013-08-04 19:09:07.740619157 +0000
 @@ -1,12 +1,14 @@
  " Vim compiler file
@@ -19098 +19667 @@
 diff -Naur vim73.orig/runtime/compiler/mipspro_c89.vim vim73/runtime/compiler/mipspro_c89.vim
 --- vim73.orig/runtime/compiler/mipspro_c89.vim 2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/mipspro_c89.vim      2013-06-07 17:07:07.855652908 +0000
++++ vim73/runtime/compiler/mipspro_c89.vim      2013-08-04 19:09:07.740619157 +0000
 @@ -1,12 +1,14 @@
  " Vim compiler file
@@ -19124 +19693 @@
 diff -Naur vim73.orig/runtime/compiler/mipspro_cpp.vim vim73/runtime/compiler/mipspro_cpp.vim
 --- vim73.orig/runtime/compiler/mipspro_cpp.vim 2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/mipspro_cpp.vim      2013-06-07 17:07:07.868986204 +0000
++++ vim73/runtime/compiler/mipspro_cpp.vim      2013-08-04 19:09:07.740619157 +0000
 @@ -1,12 +1,14 @@
  " Vim compiler file
@@ -19150 +19719 @@
 diff -Naur vim73.orig/runtime/compiler/msbuild.vim vim73/runtime/compiler/msbuild.vim
 --- vim73.orig/runtime/compiler/msbuild.vim     1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/msbuild.vim  2013-06-07 17:07:07.882319499 +0000
++++ vim73/runtime/compiler/msbuild.vim  2013-08-04 19:09:07.743952480 +0000
 @@ -0,0 +1,21 @@
 +" Vim compiler file
@@ -19173 +19742 @@
 +let &cpo = s:keepcpo
 +unlet s:keepcpo
+diff -Naur vim73.orig/runtime/compiler/ocaml.vim vim73/runtime/compiler/ocaml.vim
+--- vim73.orig/runtime/compiler/ocaml.vim       1970-01-01 00:00:00.000000000 +0000
++++ vim73/runtime/compiler/ocaml.vim    2013-08-04 19:09:07.747285803 +0000
+@@ -0,0 +1,44 @@
++" Vim Compiler File
++" Compiler:    ocaml
++" Maintainer:  See ftplugin/ocaml.vim (?)
++" Last Change: June 2013 by Marc Weber
++"
++" Marc Weber's comments:
++" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
++" ocamake and whatnot. So which one to use?
++"
++" This error format was moved from ftplugin/ocaml.vim to this file,
++" because ftplugin is the wrong file to set an error format
++" and the error format itself is annoying because it joins many lines in this
++" error case:
++"
++"    Error: The implementation foo.ml does not match the interface foo.cmi:
++"    Modules do not match case.
++"
++" So having it here makes people opt-in
++
++
++if exists("current_compiler")
++    finish
++endif
++let current_compiler = "ocaml"
++
++let s:cpo_save = &cpo
++set cpo&vim
++
++CompilerSet errorformat =
++      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
++      \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
++      \%+EReference\ to\ unbound\ regexp\ name\ %m,
++      \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
++      \%Wocamlyacc:\ w\ -\ %m,
++      \%-Zmake%.%#,
++      \%C%m,
++      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
++      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
++      \%D%*\\a:\ Entering\ directory\ `%f',
++      \%X%*\\a:\ Leaving\ directory\ `%f',
++      \%DMaking\ %*\\a\ in\ %f
++
++let &cpo = s:cpo_save
++unlet s:cpo_save
+diff -Naur vim73.orig/runtime/compiler/rake.vim vim73/runtime/compiler/rake.vim
+--- vim73.orig/runtime/compiler/rake.vim        1970-01-01 00:00:00.000000000 +0000
++++ vim73/runtime/compiler/rake.vim     2013-08-04 19:09:07.750619127 +0000
+@@ -0,0 +1,35 @@
++" Vim compiler file
++" Language:            Rake
++" Maintainer:          Tim Pope <vimNOSPAM@tpope.org>
++" URL:                 https://github.com/vim-ruby/vim-ruby
++" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
++
++if exists("current_compiler")
++  finish
++endif
++let current_compiler = "rake"
++
++if exists(":CompilerSet") != 2         " older Vim always used :setlocal
++  command -nargs=* CompilerSet setlocal <args>
++endif
++
++let s:cpo_save = &cpo
++set cpo-=C
++
++CompilerSet makeprg=rake
++
++CompilerSet errorformat=
++      \%D(in\ %f),
++      \%\\s%#from\ %f:%l:%m,
++      \%\\s%#from\ %f:%l:,
++      \%\\s%##\ %f:%l:%m,
++      \%\\s%##\ %f:%l,
++      \%\\s%#[%f:%l:\ %#%m,
++      \%\\s%#%f:%l:\ %#%m,
++      \%\\s%#%f:%l:,
++      \%m\ [%f:%l]:
++
++let &cpo = s:cpo_save
++unlet s:cpo_save
++
++" vim: nowrap sw=2 sts=2 ts=8:
+diff -Naur vim73.orig/runtime/compiler/rspec.vim vim73/runtime/compiler/rspec.vim
+--- vim73.orig/runtime/compiler/rspec.vim       2010-05-27 20:15:02.000000000 +0000
++++ vim73/runtime/compiler/rspec.vim    2013-08-04 19:09:07.753952450 +0000
+@@ -1,9 +1,7 @@
+ " Vim compiler file
+ " Language:            RSpec
+ " Maintainer:          Tim Pope <vimNOSPAM@tpope.org>
+-" Last Change:         2009 Dec 22
+-" URL:                 http://vim-ruby.rubyforge.org
+-" Anon CVS:            See above site
++" URL:                 https://github.com/vim-ruby/vim-ruby
+ " Release Coordinator: Doug Kearns <dougkearns@gmail.com>
+ 
+ if exists("current_compiler")
+@@ -18,21 +16,15 @@
+ let s:cpo_save = &cpo
+ set cpo-=C
+ 
+-CompilerSet makeprg=spec
++CompilerSet makeprg=rspec
+ 
+ CompilerSet errorformat=
+-    \%+W'%.%#'\ FAILED,
+-    \%+I'%.%#'\ FIXED,
+-    \%-Cexpected:%.%#,
+-    \%-C\ \ \ \ \ got:%.%#,
++    \%f:%l:\ %tarning:\ %m,
+     \%E%.%#:in\ `load':\ %f:%l:%m,
+-    \%C%f:%l:,
+-    \%W%f:%l:\ warning:\ %m,
+-    \%E%f:%l:in\ %*[^:]:\ %m,
+-    \%E%f:%l:\ %m,
+-    \%-Z%\tfrom\ %f:%l,
+-    \%-Z%p^%.%#,
+-    \%-C%.%#,
++    \%E%f:%l:in\ `%*[^']':\ %m,
++    \%-Z\ \ \ \ \ \#\ %f:%l:%.%#,
++    \%E\ \ %\\d%\\+)%.%#,
++    \%C\ \ \ \ \ %m,
+     \%-G%.%#
+ 
+ let &cpo = s:cpo_save
 diff -Naur vim73.orig/runtime/compiler/rst.vim vim73/runtime/compiler/rst.vim
 --- vim73.orig/runtime/compiler/rst.vim 2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/rst.vim      2013-06-07 17:07:07.988985861 +0000
++++ vim73/runtime/compiler/rst.vim      2013-08-04 19:09:07.753952450 +0000
 @@ -9,7 +9,7 @@
  let current_compiler = "rst"
@@ -19185 +19883 @@
  setlocal errorformat=
        \%f:%l:\ (%tEBUG/0)\ %m,
+diff -Naur vim73.orig/runtime/compiler/ruby.vim vim73/runtime/compiler/ruby.vim
+--- vim73.orig/runtime/compiler/ruby.vim        2010-05-27 20:15:39.000000000 +0000
++++ vim73/runtime/compiler/ruby.vim     2013-08-04 19:09:07.753952450 +0000
+@@ -1,33 +1,10 @@
+ " Vim compiler file
+ " Language:            Ruby
+ " Function:            Syntax check and/or error reporting
+-" Maintainer:          Tim Hammerquist <timh at rubyforge.org>
+-" Last Change:         2008 Aug 1
+-" URL:                 http://vim-ruby.rubyforge.org
+-" Anon CVS:            See above site
++" Maintainer:          Tim Pope <vimNOSPAM@tpope.org>
++" URL:                 https://github.com/vim-ruby/vim-ruby
+ " Release Coordinator: Doug Kearns <dougkearns@gmail.com>
+ " ----------------------------------------------------------------------------
+-"
+-" Changelog:
+-" 0.2: script saves and restores 'cpoptions' value to prevent problems with
+-"      line continuations
+-" 0.1: initial release
+-"
+-" Contributors:
+-"   Hugh Sasse <hgs@dmu.ac.uk>
+-"   Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+-"
+-" Todo:
+-"   match error type %m
+-"
+-" Comments:
+-"   I know this file isn't perfect.  If you have any questions, suggestions,
+-"   patches, etc., please don't hesitate to let me know.
+-"
+-"   This is my first experience with 'errorformat' and compiler plugins and
+-"   I welcome any input from more experienced (or clearer-thinking)
+-"   individuals.
+-" ----------------------------------------------------------------------------
+ 
+ if exists("current_compiler")
+   finish
+diff -Naur vim73.orig/runtime/compiler/rubyunit.vim vim73/runtime/compiler/rubyunit.vim
+--- vim73.orig/runtime/compiler/rubyunit.vim    2010-05-27 20:15:23.000000000 +0000
++++ vim73/runtime/compiler/rubyunit.vim 2013-08-04 19:09:07.757285773 +0000
+@@ -1,9 +1,7 @@
+ " Vim compiler file
+ " Language:            Test::Unit - Ruby Unit Testing Framework
+ " Maintainer:          Doug Kearns <dougkearns@gmail.com>
+-" Last Change:         2008 Aug 1
+-" URL:                 http://vim-ruby.rubyforge.org
+-" Anon CVS:            See above site
++" URL:                 https://github.com/vim-ruby/vim-ruby
+ " Release Coordinator: Doug Kearns <dougkearns@gmail.com>
+ 
+ if exists("current_compiler")
 diff -Naur vim73.orig/runtime/compiler/sass.vim vim73/runtime/compiler/sass.vim
 --- vim73.orig/runtime/compiler/sass.vim        1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/sass.vim     2013-06-07 17:07:08.008985804 +0000
++++ vim73/runtime/compiler/sass.vim     2013-08-04 19:09:07.757285773 +0000
 @@ -0,0 +1,30 @@
 +" Vim compiler file
@@ -19221 +19972 @@
 diff -Naur vim73.orig/runtime/compiler/tex.vim vim73/runtime/compiler/tex.vim
 --- vim73.orig/runtime/compiler/tex.vim 2010-05-15 11:03:29.000000000 +0000
-+++ vim73/runtime/compiler/tex.vim      2013-06-07 17:07:08.085652252 +0000
++++ vim73/runtime/compiler/tex.vim      2013-08-04 19:09:07.760619097 +0000
 @@ -1,11 +1,13 @@
  " Vim compiler file
@@ -19257 +20008 @@
 diff -Naur vim73.orig/runtime/compiler/xbuild.vim vim73/runtime/compiler/xbuild.vim
 --- vim73.orig/runtime/compiler/xbuild.vim      1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/compiler/xbuild.vim   2013-06-07 17:07:08.128985461 +0000
++++ vim73/runtime/compiler/xbuild.vim   2013-08-04 19:09:07.763952420 +0000
 @@ -0,0 +1,22 @@
 +" Vim compiler file
@@ -19281 +20032 @@
 +let &cpo = s:keepcpo
 +unlet s:keepcpo
+diff -Naur vim73.orig/runtime/compiler/xmllint.vim vim73/runtime/compiler/xmllint.vim
+--- vim73.orig/runtime/compiler/xmllint.vim     2010-05-15 11:03:29.000000000 +0000
++++ vim73/runtime/compiler/xmllint.vim  2013-08-04 19:09:07.763952420 +0000
+@@ -1,8 +1,7 @@
+ " Vim compiler file
+ " Compiler:    xmllint
+-" Maintainer:  Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+-" URL:         http://gus.gscit.monash.edu.au/~djkea2/vim/compiler/xmllint.vim
+-" Last Change: 2004 Nov 27
++" Maintainer:  Doug Kearns <dougkearns@gmail.com>
++" Last Change: 2013 Jun 1
+ 
+ if exists("current_compiler")
+   finish
+@@ -18,10 +17,8 @@
+ 
+ CompilerSet makeprg=xmllint\ --valid\ --noout\ 
+ 
+-CompilerSet errorformat=%E%f:%l:\ error:\ %m,
+-                   \%W%f:%l:\ warning:\ %m,
+-                   \%E%f:%l:\ validity\ error:\ %m,
+-                   \%W%f:%l:\ validity\ warning:\ %m,
++CompilerSet errorformat=%+E%f:%l:\ %.%#\ error\ :\ %m,
++                   \%+W%f:%l:\ %.%#\ warning\ :\ %m,
+                    \%-Z%p^,
+                    \%-G%.%#
+ 
 diff -Naur vim73.orig/runtime/doc/arabic.txt vim73/runtime/doc/arabic.txt
 --- vim73.orig/runtime/doc/arabic.txt   2010-08-15 12:23:19.000000000 +0000
-+++ vim73/runtime/doc/arabic.txt        2013-06-07 17:07:08.218985204 +0000
++++ vim73/runtime/doc/arabic.txt        2013-08-04 19:09:07.770619066 +0000
 @@ -1,4 +1,4 @@
 -*arabic.txt*   For Vim version 7.3.  Last change: 2005 Mar 29
@@ -19301 +20079 @@
 diff -Naur vim73.orig/runtime/doc/autocmd.txt vim73/runtime/doc/autocmd.txt
 --- vim73.orig/runtime/doc/autocmd.txt  2010-08-15 12:23:19.000000000 +0000
-+++ vim73/runtime/doc/autocmd.txt       2013-06-07 17:07:08.242318471 +0000
++++ vim73/runtime/doc/autocmd.txt       2013-08-04 19:09:07.773952390 +0000
 @@ -1,4 +1,4 @@
 -*autocmd.txt*   For Vim version 7.3.  Last change: 2010 Jul 22
-+*autocmd.txt*   For Vim version 7.3.  Last change: 2013 May 19
++*autocmd.txt*   For Vim version 7.3.  Last change: 2013 Jun 15
  
  
@@ -19378 +20156 @@
  CursorHold                     When the user doesn't press a key for the time
                                 specified with 'updatetime'.  Not re-triggered
-@@ -502,10 +519,12 @@
+@@ -496,16 +513,18 @@
+ CursorHoldI                    Just like CursorHold, but in Insert mode.
+ 
+                                                        *CursorMoved*
+-CursorMoved                    After the cursor was moved in Normal mode.
+-                               Also when the text of the cursor line has been
+-                               changed, e.g., with "x", "rx" or "p".
++CursorMoved                    After the cursor was moved in Normal or Visual
++                               mode.  Also when the text of the cursor line
++                               has been changed, e.g., with "x", "rx" or "p".
                                 Not triggered when there is typeahead or when
                                 an operator is pending.
@@ -19529 +20316 @@
 diff -Naur vim73.orig/runtime/doc/change.txt vim73/runtime/doc/change.txt
 --- vim73.orig/runtime/doc/change.txt   2010-08-15 12:23:19.000000000 +0000
-+++ vim73/runtime/doc/change.txt        2013-06-07 17:07:08.275651709 +0000
++++ vim73/runtime/doc/change.txt        2013-08-04 19:09:07.780619036 +0000
 @@ -1,4 +1,4 @@
 -*change.txt*    For Vim version 7.3.  Last change: 2010 Jul 29
@@ -19942 +20729 @@
 diff -Naur vim73.orig/runtime/doc/cmdline.txt vim73/runtime/doc/cmdline.txt
 --- vim73.orig/runtime/doc/cmdline.txt  2010-08-15 12:23:19.000000000 +0000
-+++ vim73/runtime/doc/cmdline.txt       2013-06-07 17:07:08.295651652 +0000
++++ vim73/runtime/doc/cmdline.txt       2013-08-04 19:09:07.783952360 +0000
 @@ -1,4 +1,4 @@
 -*cmdline.txt*   For Vim version 7.3.  Last change: 2010 May 07
@@ -20169 +20956 @@
 diff -Naur vim73.orig/runtime/doc/debug.txt vim73/runtime/doc/debug.txt
 --- vim73.orig/runtime/doc/debug.txt    2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/debug.txt 2013-06-07 17:07:08.328984890 +0000
++++ vim73/runtime/doc/debug.txt 2013-08-04 19:09:07.783952360 +0000
 @@ -1,4 +1,4 @@
 -*debug.txt*     For Vim version 7.3.  Last change: 2010 Jul 20
@@ -20242 +21029 @@
 diff -Naur vim73.orig/runtime/doc/develop.txt vim73/runtime/doc/develop.txt
 --- vim73.orig/runtime/doc/develop.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/develop.txt       2013-06-07 17:07:08.365651452 +0000
++++ vim73/runtime/doc/develop.txt       2013-08-04 19:09:07.787285683 +0000
 @@ -1,4 +1,4 @@
 -*develop.txt*   For Vim version 7.3.  Last change: 2008 Dec 17
@@ -20277 +21064 @@
 diff -Naur vim73.orig/runtime/doc/diff.txt vim73/runtime/doc/diff.txt
 --- vim73.orig/runtime/doc/diff.txt     2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/diff.txt  2013-06-07 17:07:08.375651424 +0000
++++ vim73/runtime/doc/diff.txt  2013-08-04 19:09:07.790619006 +0000
 @@ -1,4 +1,4 @@
 -*diff.txt*      For Vim version 7.3.  Last change: 2010 Jul 31
@@ -20393 +21180 @@
 diff -Naur vim73.orig/runtime/doc/digraph.txt vim73/runtime/doc/digraph.txt
 --- vim73.orig/runtime/doc/digraph.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/digraph.txt       2013-06-07 17:07:08.392318043 +0000
++++ vim73/runtime/doc/digraph.txt       2013-08-04 19:09:07.793952330 +0000
 @@ -1,4 +1,4 @@
 -*digraph.txt*   For Vim version 7.3.  Last change: 2010 Apr 11
@@ -21809 +22596 @@
 diff -Naur vim73.orig/runtime/doc/editing.txt vim73/runtime/doc/editing.txt
 --- vim73.orig/runtime/doc/editing.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/editing.txt       2013-06-07 17:07:08.435651253 +0000
++++ vim73/runtime/doc/editing.txt       2013-08-04 19:09:07.797285653 +0000
 @@ -1,4 +1,4 @@
 -*editing.txt*   For Vim version 7.3.  Last change: 2010 Jul 28
@@ -21996 +22783 @@
 diff -Naur vim73.orig/runtime/doc/eval.txt vim73/runtime/doc/eval.txt
 --- vim73.orig/runtime/doc/eval.txt     2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/eval.txt  2013-06-07 17:07:08.518984348 +0000
++++ vim73/runtime/doc/eval.txt  2013-08-04 19:09:07.810618946 +0000
 @@ -1,4 +1,4 @@
 -*eval.txt*     For Vim version 7.3.  Last change: 2010 Aug 15
-+*eval.txt*     For Vim version 7.3.  Last change: 2013 May 21
++*eval.txt*     For Vim version 7.3.  Last change: 2013 Jun 11
  
  
@@ -22364 +23151 @@
                                 List    items from {expr} to {max}
  readfile( {fname} [, {binary} [, {max}]])
-@@ -1872,6 +1906,8 @@
+@@ -1872,6 +1906,10 @@
  resolve( {filename})           String  get filename a shortcut points to
  reverse( {list})               List    reverse {list} in-place
  round( {expr})                 Float   round off {expr}
++screenattr( {row}, {col})      Number  attribute at screen position
++screenchar( {row}, {col})      Number  character at screen position
 +screencol()                    Number  current cursor column
 +screenrow()                    Number  current cursor row
@@ -22373 +23162 @@
                                 Number  search for {pattern}
  searchdecl( {name} [, {global} [, {thisblock}]])
-@@ -1898,20 +1934,23 @@
+@@ -1898,20 +1936,23 @@
  settabwinvar( {tabnr}, {winnr}, {varname}, {val})    set {varname} in window
                                         {winnr} in tab page {tabnr} to {val}
@@ -22399 +23188 @@
  str2nr( {expr} [, {base}])     Number  convert String to Number
  strchars( {expr})              Number  character length of the String {expr}
-@@ -1927,13 +1966,14 @@
+@@ -1927,13 +1968,14 @@
                                 Number  last index of {needle} in {haystack}
  strtrans( {expr})              String  translate string to make it printable
@@ -22415 +23204 @@
  system( {expr} [, {input}])    String  output of shell command/filter {expr}
  tabpagebuflist( [{arg}])       List    list of buffer numbers in tab page
-@@ -1949,13 +1989,14 @@
+@@ -1949,13 +1991,14 @@
  toupper( {expr})               String  the String {expr} switched to uppercase
  tr( {src}, {fromstr}, {tostr}) String  translate chars of {src} in {fromstr}
@@ -22431 +23220 @@
  wincol()                       Number  window column of the cursor
  winheight( {nr})               Number  height of window {nr}
-@@ -1967,6 +2008,7 @@
+@@ -1967,6 +2010,7 @@
  winwidth( {nr})                        Number  width of window {nr}
  writefile( {list}, {fname} [, {binary}])
@@ -22439 +23228 @@
  abs({expr})                                                    *abs()*
                 Return the absolute value of {expr}.  When {expr} evaluates to
-@@ -2006,6 +2048,13 @@
+@@ -2006,6 +2050,13 @@
                 Use |insert()| to add an item at another position.
  
@@ -22453 +23242 @@
                 When {expr} is a |List|: Append each item of the |List| as a
                 text line below line {lnum} in the current buffer.
-@@ -2250,14 +2299,17 @@
+@@ -2250,14 +2301,17 @@
                 redo it is the number of the redone change.  After undo it is
                 one less than the number of the undone change.
@@ -22474 +23263 @@
  cindent({lnum})                                                *cindent()*
                 Get the amount of indent for line {lnum} according the C
-@@ -2277,7 +2329,7 @@
+@@ -2277,7 +2331,7 @@
                 position given with {expr}.  The accepted positions are:
                     .       the cursor position
@@ -22483 +23272 @@
                             returned)
                 Additionally {expr} can be [lnum, col]: a |List| with the line
-@@ -2531,6 +2583,8 @@
+@@ -2531,6 +2585,8 @@
                 which is 0 if the file was deleted successfully, and non-zero
                 when the deletion failed.
@@ -22492 +23281 @@
                                                         *did_filetype()*
  did_filetype() Returns non-zero when autocommands are being executed and the
-@@ -2708,13 +2762,15 @@
+@@ -2708,16 +2764,19 @@
                 {only available when compiled with the |+float| feature}
  
@@ -22512 +23301 @@
  
                 If the expansion fails, the result is an empty string.  A name
-                for a non-existing file is not included.
-@@ -2731,6 +2787,7 @@
+-               for a non-existing file is not included.
++               for a non-existing file is not included, unless {expr} does
++               not start with '%', '#' or '<', see below.
+ 
+                When {expr} starts with '%', '#' or '<', the expansion is done
+                like for the |cmdline-special| variables with their associated
+@@ -2731,6 +2790,7 @@
                         <abuf>          autocmd buffer number (as a String!)
                         <amatch>        autocmd matched name
@@ -22521 +23315 @@
                         <cWORD>         WORD under the cursor
                         <client>        the {clientid} of the last received
-@@ -2767,10 +2824,10 @@
+@@ -2767,10 +2827,10 @@
                 When {expr} does not start with '%', '#' or '<', it is
                 expanded like a file name is expanded on the command line.
@@ -22536 +23330 @@
  <
                 Expand() can also be used to expand variables and environment
-@@ -3043,7 +3100,7 @@
+@@ -3043,7 +3103,7 @@
                 {name} can be a user defined function or an internal function.
  
@@ -22545 +23339 @@
                 references.  There is hardly ever a need to invoke this
                 function, as it is automatically done when Vim runs out of
-@@ -3053,7 +3110,7 @@
+@@ -3053,7 +3113,7 @@
                 This is useful if you have deleted a very big |List| and/or
                 |Dictionary| with circular references in a script that runs
@@ -22554 +23348 @@
                 done before.  This is useful when checking for memory leaks.
  
-@@ -3091,7 +3148,7 @@
+@@ -3091,7 +3151,7 @@
                 Example: >
                         :let lines = getbufline(bufnr("myfile"), 1, "$")
@@ -22563 +23357 @@
                 {varname} in buffer {expr}.  Note that the name without "b:"
                 must be used.
-@@ -3101,8 +3158,8 @@
+@@ -3101,8 +3161,8 @@
                 doesn't work for a global variable, window-local variable or
                 window-local option.
@@ -22574 +23368 @@
                         :let bufmodified = getbufvar(1, "&mod")
                         :echo "todo myvar = " . getbufvar("todo", "myvar")
-@@ -3129,6 +3186,8 @@
+@@ -3129,6 +3189,8 @@
                 one-byte character it is the character itself as a number.
                 Use nr2char() to convert it to a String.
@@ -22583 +23377 @@
                 returned.  The position can then be found in |v:mouse_col|,
                 |v:mouse_lnum| and |v:mouse_win|.  This example positions the
-@@ -3167,10 +3226,11 @@
+@@ -3167,10 +3229,11 @@
                         2       shift
                         4       control
@@ -22599 +23393 @@
                 character itself are obtained.  Thus Shift-a results in "A"
                 without a modifier.
-@@ -3187,7 +3247,8 @@
+@@ -3187,7 +3250,8 @@
                 Return the position of the cursor in the command line as a
                 byte count.  The first column is 1.
@@ -22609 +23403 @@
  
  getcmdtype()                                           *getcmdtype()*
-@@ -3200,8 +3261,8 @@
+@@ -3200,8 +3264,8 @@
                     @   |input()| command
                     -   |:insert| or |:append| command
@@ -22620 +23414 @@
  
                                                         *getcwd()*
-@@ -3239,8 +3300,9 @@
+@@ -3239,8 +3303,9 @@
                 "rwx" flags represent, in turn, the permissions of the owner
                 of the file, the group the file belongs to, and other users.
@@ -22631 +23425 @@
                 the string "rw-r--r--" or even "rw-------".
  
-@@ -3374,26 +3436,30 @@
+@@ -3374,26 +3439,30 @@
                 <CTRL-V> is one character with value 0x16.
                 If {regname} is not specified, |v:register| is used.
@@ -22667 +23461 @@
                         :let list_is_on = gettabwinvar(1, 2, '&list')
                         :echo "myvar = " . gettabwinvar(3, 1, 'myvar')
-@@ -3408,24 +3474,31 @@
+@@ -3408,24 +3477,31 @@
                 the top of the GUI Vim window.  The result will be -1 if the
                 information is not available.
@@ -22707 +23501 @@
                 For most systems backticks can be used to get files names from
                 any external command.  Example: >
-@@ -3511,6 +3584,9 @@
+@@ -3511,6 +3587,9 @@
                         "search" or "/"   search pattern history
                         "expr"   or "="   typed expression history
@@ -22717 +23511 @@
                 shifted to become the newest entry.
                 The result is a Number: 1 if the operation was successful,
-@@ -3694,10 +3770,10 @@
+@@ -3694,10 +3773,10 @@
                 Like |input()|, but when the GUI is running and text dialogs
                 are supported, a dialog window pops up to input the text.
@@ -22732 +23526 @@
                 omitted an empty string is returned.
                 Hitting <Enter> works like pressing the OK button.  Hitting
-@@ -3759,6 +3835,11 @@
+@@ -3759,6 +3838,11 @@
                 Note that when {item} is a |List| it is inserted as a single
                 item.  Use |extend()| to concatenate |Lists|.
@@ -22744 +23538 @@
                 The result is a Number, which is non-zero when a directory
                 with the name {directory} exists.  If {directory} doesn't
-@@ -3897,11 +3978,12 @@
+@@ -3897,11 +3981,12 @@
                 Return the byte count from the start of the buffer for line
                 {lnum}.  This includes the end-of-line character, depending on
@@ -22759 +23553 @@
                 disabled at compile time, -1 is returned.
                 Also see |byte2line()|, |go| and |:goto|.
-@@ -3941,6 +4023,20 @@
+@@ -3941,6 +4026,20 @@
  <                      -2.0
                 {only available when compiled with the |+float| feature}
@@ -22780 +23574 @@
                 {expr} must be a |List| or a |Dictionary|.
                 Replace each item in {expr} with the result of evaluating
-@@ -3959,30 +4055,58 @@
+@@ -3959,30 +4058,58 @@
  
                 The operation is done in-place.  If you want a |List| or
@@ -22847 +23641 @@
                 then the global mappings.
                 This function can be used to map a key even when it's already
-@@ -4031,6 +4155,7 @@
+@@ -4031,6 +4158,7 @@
                 {pat} matches.
                 A match at the first character or |List| item returns zero.
@@ -22855 +23649 @@
                         :echo match("testing", "ing")   " results in 4
                         :echo match([1, 'x'], '\a')     " results in 1
-@@ -4236,7 +4361,7 @@
+@@ -4236,7 +4364,7 @@
  
  mzeval({expr})                                                 *mzeval()*
@@ -22864 +23658 @@
                 Pairs (including lists and improper lists) and vectors are
                 returned as Vim |Lists|.
-@@ -4259,14 +4384,16 @@
+@@ -4259,14 +4387,16 @@
                 below it, zero is returned.
                 See also |prevnonblank()|.
@@ -22884 +23678 @@
                 characters.  nr2char(0) is a real NUL and terminates the
                 string, thus results in an empty string.
-@@ -4295,6 +4422,13 @@
+@@ -4295,6 +4425,13 @@
                         call setpos('.', save_cursor)
  <              Also see |setpos()|.
@@ -22898 +23692 @@
                 Shorten directory names in the path {expr} and return the
                 result.  The tail, the file name, is kept as-is.  The other
-@@ -4334,6 +4468,7 @@
+@@ -4334,6 +4471,7 @@
  
                 Often used items are:
@@ -22906 +23700 @@
                   %.9s  string truncated to 9 bytes
                   %c    single byte
-@@ -4448,6 +4583,10 @@
+@@ -4448,6 +4586,10 @@
                 s       The text of the String argument is used.  If a
                         precision is specified, no more bytes than the number
@@ -22917 +23711 @@
                                                         *printf-f* *E807*
                 f       The Float argument is converted into a string of the 
-@@ -4500,6 +4639,29 @@
+@@ -4500,6 +4642,29 @@
                 This can be used to avoid some things that would remove the
                 popup menu.
@@ -22947 +23741 @@
  range({expr} [, {max} [, {stride}]])                           *range()*
                 Returns a |List| with Numbers:
-@@ -4727,12 +4889,35 @@
+@@ -4727,12 +4892,50 @@
                         echo round(-4.5)
  <                      -5.0
@@ -22953 +23747 @@
 -               
 -               
++
++screenattr(row, col)                                           *screenattr()*
++               Like screenchar(), but return the attribute.  This is a rather
++               arbitrary number that can only be used to compare to the
++               attribute at other positions.
++
++screenchar(row, col)                                           *screenchar()*
++               The result is a Number, which is the character at position
++               [row, col] on the screen.  This works for every possible
++               screen position, also status lines, window separators and the
++               command line.  The top left position is row one, column one
++               The character excludes composing characters.  For double-byte
++               encodings it may only be the first byte.
++               This is mainly to be used for testing.
++               Returns -1 when row or col is out of range.
 +
 +screencol()                                                    *screencol()*
@@ -22985 +23794 @@
                 'b'     search backward instead of forward
                 'c'     accept a match at the cursor position
-@@ -4760,15 +4945,12 @@
+@@ -4760,15 +4963,12 @@
                 A zero value is equal to not giving the argument.
  
@@ -23002 +23811 @@
                 With the 'p' flag the returned value is one more than the
                 first sub-match in \(\).  One if none of them matched but the
-@@ -4987,7 +5169,8 @@
+@@ -4987,7 +5187,8 @@
                 line.
  
@@ -23012 +23821 @@
                 When {lnum} is just below the last line the {text} will be
                 added as a new line.
-@@ -4998,7 +5181,7 @@
+@@ -4998,7 +5199,7 @@
                 will be set to the items in the list.  Example: >
                         :call setline(5, ['aaa', 'bbb', 'ccc'])
@@ -23021 +23830 @@
                         :endfor
  <              Note: The '[ and '] marks are not set.
-@@ -5112,8 +5295,9 @@
+@@ -5112,8 +5313,9 @@
  
                 If {options} contains no register settings, then the default
@@ -23033 +23842 @@
                 Examples: >
                         :call setreg(v:register, @*)
-@@ -5136,8 +5320,6 @@
+@@ -5136,8 +5338,6 @@
                 |t:var|
                 Note that the variable name without "t:" must be used.
@@ -23042 +23851 @@
  
  settabwinvar({tabnr}, {winnr}, {varname}, {val})       *settabwinvar()*
-@@ -5150,8 +5332,6 @@
+@@ -5150,8 +5350,6 @@
                 doesn't work for a global or local buffer variable.
                 For a local buffer option the global value is unchanged.
@@ -23051 +23860 @@
                         :call settabwinvar(1, 1, "&list", 0)
                         :call settabwinvar(3, 2, "myvar", "foobar")
-@@ -5163,6 +5343,11 @@
+@@ -5163,6 +5361,11 @@
                         :call setwinvar(1, "&list", 0)
                         :call setwinvar(2, "myvar", "foobar")
@@ -23063 +23872 @@
                 Escape {string} for use as a shell command argument.
                 On MS-Windows and MS-DOS, when 'shellslash' is not set, it
-@@ -5189,6 +5374,23 @@
+@@ -5189,6 +5392,23 @@
                     :call system("chmod +w -- " . shellescape(expand("%")))
  
@@ -23087 +23896 @@
                 Simplify the file name as much as possible without changing
                 the meaning.  Shortcuts (on MS-Windows) or symbolic links (on
-@@ -5228,7 +5430,7 @@
+@@ -5228,7 +5448,7 @@
                 {only available when compiled with the |+float| feature}
  
@@ -23096 +23905 @@
                 want a list to remain unmodified make a copy first: >
                         :let sortedlist = sort(copy(mylist))
-@@ -5236,6 +5438,8 @@
+@@ -5236,6 +5456,8 @@
                 Numbers sort after Strings, |Lists| after Numbers.
                 For sorting text in the current buffer use |:sort|.
@@ -23105 +23914 @@
                 is called to compare items.  The function is invoked with two
                 items as argument and must return zero if they are equal, 1 or
-@@ -5316,7 +5520,8 @@
+@@ -5316,7 +5538,8 @@
                 empty each white-separated sequence of characters becomes an
                 item.
@@ -23115 +23924 @@
                 {keepempty} argument is given and it's non-zero.
                 Other empty items are kept when {pattern} matches at least one
-@@ -5416,8 +5621,8 @@
+@@ -5416,8 +5639,8 @@
                 {haystack} of the first occurrence of the String {needle}.
                 If {start} is specified, the search starts at index {start}.
@@ -23126 +23935 @@
                 For pattern searches use |match()|.
                 -1 is returned if the {needle} does not occur in {haystack}.
-@@ -5507,9 +5712,11 @@
+@@ -5507,9 +5730,11 @@
                 Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
  
@@ -23141 +23950 @@
                         :s/\d\+/\=submatch(0) + 1/
  <              This finds the first number in the line and adds one to it.
-@@ -5517,26 +5724,37 @@
+@@ -5517,26 +5742,37 @@
  
  substitute({expr}, {pat}, {sub}, {flags})              *substitute()*
@@ -23188 +23997 @@
                 The result is a Number, which is the syntax ID at the position
                 {lnum} and {col} in the current window.
-@@ -5558,20 +5776,6 @@
+@@ -5558,20 +5794,6 @@
                         :echo synIDattr(synID(line("."), col("."), 1), "name")
  <
@@ -23209 +24018 @@
                 The result is a String, which is the {what} attribute of
                 syntax ID {synID}.  This can be used to obtain information
-@@ -5612,6 +5816,20 @@
+@@ -5612,6 +5834,20 @@
                 highlight the character.  Highlight links given with
                 ":highlight link" are followed.
@@ -23230 +24039 @@
                 Return a |List|, which is the stack of syntax items at the
                 position {lnum} and {col} in the current window.  Each item in
-@@ -5674,9 +5892,9 @@
+@@ -5674,9 +5910,9 @@
                 omitted the current tab page is used.
                 When {arg} is invalid the number zero is returned.
@@ -23242 +24051 @@
  <              Note that a buffer may appear in more than one window.
  
-@@ -5737,8 +5955,9 @@
+@@ -5737,8 +5973,9 @@
                 If there are no matching tags, then an empty list is returned.
  
@@ -23254 +24063 @@
                 Refer to |'tags'| for information about how the tags file is
                 located by Vim. Refer to |tags-file-format| for the format of
-@@ -5839,6 +6058,8 @@
+@@ -5839,6 +6076,8 @@
                 the undo file exists.
                 {name} is always expanded to the full path, since that is what
@@ -23263 +24072 @@
                 When compiled without the +persistent_undo option this always
                 returns an empty string.
-@@ -5898,13 +6119,13 @@
+@@ -5898,13 +6137,13 @@
                 would be of unlimited width.  When there is a <Tab> at the
                 position, the returned Number will be the column at the end of
@@ -23279 +24088 @@
                 beyond the end of the line can be returned. |'virtualedit'|
                 The accepted positions are:
-@@ -5947,6 +6168,18 @@
+@@ -5947,6 +6186,18 @@
                 Dictionary or Float is not a Number or String, thus does not
                 cause the mode to be cleared.
@@ -23298 +24107 @@
  winbufnr({nr}) The result is a Number, which is the number of the buffer
                 associated with window {nr}.  When {nr} is zero, the number of
-@@ -5979,8 +6212,9 @@
+@@ -5979,8 +6230,9 @@
  winnr([{arg}]) The result is a Number, which is the number of the current
                 window.  The top window has number 1.
@@ -23310 +24119 @@
                 If there is no previous window or it is in another tab page 0
                 is returned.
-@@ -6056,8 +6290,16 @@
+@@ -6056,8 +6308,16 @@
                 To copy a file byte for byte: >
                         :let fl = readfile("foo", "b")
@@ -23327 +24136 @@
  There are three types of features:
  1.  Features that are only supported when they have been enabled when Vim
-@@ -6084,6 +6326,7 @@
+@@ -6084,6 +6344,7 @@
  beos                   BeOS version of Vim.
  browse                 Compiled with |:browse| support, and browse() will
@@ -23335 +24144 @@
  byte_offset            Compiled with support for 'o' in 'statusline'
  cindent                        Compiled with 'cindent' support.
-@@ -6093,17 +6336,17 @@
+@@ -6093,17 +6354,17 @@
  cmdline_hist           Compiled with |cmdline-history| support.
  cmdline_info           Compiled with 'showcmd' and 'ruler' support.
@@ -23355 +24164 @@
  emacs_tags             Compiled with support for Emacs tags.
  eval                   Compiled with expression evaluation support.  Always
-@@ -6126,15 +6369,15 @@
+@@ -6126,15 +6387,15 @@
  gettext                        Compiled with message translation |multi-lang|
  gui                    Compiled with GUI enabled.
@@ -23373 +24182 @@
  iconv                  Can use iconv() for conversion.
  insert_expand          Compiled with support for CTRL-X expansion commands in
-@@ -6156,30 +6399,32 @@
+@@ -6156,30 +6417,32 @@
  mksession              Compiled with support for |:mksession|.
  modify_fname           Compiled with file name modifiers. |filename-modifiers|
@@ -23410 +24219 @@
  quickfix               Compiled with |quickfix| support.
  reltime                        Compiled with |reltime()| support.
-@@ -6190,11 +6435,11 @@
+@@ -6190,11 +6453,11 @@
  signs                  Compiled with |:sign| support.
  smartindent            Compiled with 'smartindent' support.
@@ -23423 +24232 @@
  syntax_items           There are active syntax highlighting items for the
                         current buffer.
-@@ -6215,9 +6460,9 @@
+@@ -6215,9 +6478,9 @@
  toolbar                        Compiled with support for |gui-toolbar|.
  unix                   Unix version of Vim.
@@ -23435 +24244 @@
  visual                 Compiled with Visual mode.
  visualextra            Compiled with extra Visual mode commands.
-@@ -6226,16 +6471,18 @@
+@@ -6226,16 +6489,18 @@
  vreplace               Compiled with |gR| and |gr| commands.
  wildignore             Compiled with 'wildignore' option.
@@ -23458 +24267 @@
  xsmp_interact          Compiled with interactive X session management support.
  xterm_clipboard                Compiled with support for xterm clipboard.
-@@ -6308,7 +6555,7 @@
+@@ -6308,7 +6573,7 @@
  <
  See |:verbose-cmd| for more information.
@@ -23467 +24276 @@
                         Define a new function by the name {name}.  The name
                         must be made of alphanumeric characters and '_', and
-@@ -6338,6 +6585,8 @@
+@@ -6338,6 +6603,8 @@
                         is excluded, ":{range}call" will call the function for
                         each line in the range, with the cursor on the start
@@ -23476 +24285 @@
                         When the [abort] argument is added, the function will
                         abort as soon as an error is detected.
-@@ -6569,9 +6818,9 @@
+@@ -6569,9 +6836,9 @@
  ==============================================================================
  6. Curly braces names                                  *curly-braces-names*
@@ -23489 +24298 @@
  
  When Vim encounters this, it evaluates the expression inside the braces, puts
-@@ -6607,6 +6856,11 @@
+@@ -6607,6 +6874,11 @@
  
  This would call the function "my_func_whizz(parameter)".
@@ -23501 +24310 @@
  7. Commands                                            *expression-commands*
  
-@@ -6741,7 +6995,8 @@
+@@ -6741,7 +7013,8 @@
  :let [{name}, ..., ; {lastname}] -= {expr1}
                         Like above, but append/add/subtract the value for each
@@ -23511 +24320 @@
                         variable names may be given.  Special names recognized
                         here:                           *E738*
-@@ -7027,7 +7282,9 @@
+@@ -7027,7 +7300,9 @@
                         is terminated.
                         Example: >
@@ -23524 +24333 @@
 diff -Naur vim73.orig/runtime/doc/evim-fr.1 vim73/runtime/doc/evim-fr.1
 --- vim73.orig/runtime/doc/evim-fr.1    2010-05-15 11:04:00.000000000 +0000
-+++ vim73/runtime/doc/evim-fr.1 2013-06-07 17:07:08.552317586 +0000
++++ vim73/runtime/doc/evim-fr.1 2013-08-04 19:09:07.813952269 +0000
 @@ -1,4 +1,4 @@
 -.TH EVIM 1 "16 février 2002 February 16"
@@ -23538 +24347 @@
 diff -Naur vim73.orig/runtime/doc/evim-fr.UTF-8.1 vim73/runtime/doc/evim-fr.UTF-8.1
 --- vim73.orig/runtime/doc/evim-fr.UTF-8.1      2010-05-15 11:04:00.000000000 +0000
-+++ vim73/runtime/doc/evim-fr.UTF-8.1   2013-06-07 17:07:08.558984234 +0000
++++ vim73/runtime/doc/evim-fr.UTF-8.1   2013-08-04 19:09:07.813952269 +0000
 @@ -1,4 +1,4 @@
 -.TH EVIM 1 "16 février 2002 February 16"
@@ -23552 +24361 @@
 diff -Naur vim73.orig/runtime/doc/filetype.txt vim73/runtime/doc/filetype.txt
 --- vim73.orig/runtime/doc/filetype.txt 2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/filetype.txt      2013-06-07 17:07:08.652317301 +0000
++++ vim73/runtime/doc/filetype.txt      2013-08-04 19:09:07.827285563 +0000
 @@ -1,4 +1,4 @@
 -*filetype.txt*  For Vim version 7.3.  Last change: 2008 Jul 15
@@ -23589 +24398 @@
 diff -Naur vim73.orig/runtime/doc/fold.txt vim73/runtime/doc/fold.txt
 --- vim73.orig/runtime/doc/fold.txt     2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/fold.txt  2013-06-07 17:07:08.665650596 +0000
++++ vim73/runtime/doc/fold.txt  2013-08-04 19:09:07.827285563 +0000
 @@ -60,7 +60,7 @@
  The nesting of folds is limited with 'foldnestmax'.
@@ -23601 +24410 @@
 diff -Naur vim73.orig/runtime/doc/ft_ada.txt vim73/runtime/doc/ft_ada.txt
 --- vim73.orig/runtime/doc/ft_ada.txt   2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/ft_ada.txt        2013-06-07 17:07:08.678983891 +0000
++++ vim73/runtime/doc/ft_ada.txt        2013-08-04 19:09:07.830618886 +0000
 @@ -6,20 +6,20 @@
  ADA                                                                  *ada.vim*
@@ -23668 +24477 @@
 diff -Naur vim73.orig/runtime/doc/ft_sql.txt vim73/runtime/doc/ft_sql.txt
 --- vim73.orig/runtime/doc/ft_sql.txt   2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/ft_sql.txt        2013-06-07 17:07:08.692317187 +0000
++++ vim73/runtime/doc/ft_sql.txt        2013-08-04 19:09:07.830618886 +0000
 @@ -1,4 +1,4 @@
 -*ft_sql.txt*   For Vim version 7.3.  Last change: 2010 Jul 20
@@ -23713 +24522 @@
 diff -Naur vim73.orig/runtime/doc/gui.txt vim73/runtime/doc/gui.txt
 --- vim73.orig/runtime/doc/gui.txt      2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/gui.txt   2013-06-07 17:07:08.705650482 +0000
++++ vim73/runtime/doc/gui.txt   2013-08-04 19:09:07.833952209 +0000
 @@ -1,4 +1,4 @@
 -*gui.txt*       For Vim version 7.3.  Last change: 2010 May 14
-+*gui.txt*       For Vim version 7.3.  Last change: 2011 Jul 22
++*gui.txt*       For Vim version 7.3.  Last change: 2013 Jun 12
  
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -147,6 +147,15 @@
+@@ -93,10 +93,16 @@
+ terminal version.
+ 
+ Recommended place for your personal GUI initializations:
+-       Unix                $HOME/.gvimrc
+-       OS/2                $HOME/.gvimrc or $VIM/.gvimrc
+-       MS-DOS and Win32    $HOME/_gvimrc or $VIM/_gvimrc
+-       Amiga               s:.gvimrc or $VIM/.gvimrc
++       Unix                $HOME/.gvimrc or $HOME/.vim/gvimrc
++       OS/2                $HOME/.gvimrc, $HOME/vimfiles/gvimrc
++                           or $VIM/.gvimrc
++       MS-DOS and Win32    $HOME/_gvimrc, $HOME/vimfiles/gvimrc
++                           or $VIM/_gvimrc
++       Amiga               s:.gvimrc, home:.gvimrc, home:vimfiles:gvimrc
++                           or $VIM/.gvimrc
++
++The personal initialization files are searched in the order specified above
++and only the first one that is found is read.
+ 
+ There are a number of options which only have meaning in the GUI version of
+ Vim.  These are 'guicursor', 'guifont', 'guipty' and 'guioptions'.  They are
+@@ -147,6 +153,15 @@
  If you are running the X Window System, you can get information about the
  window Vim is running in with this command: >
@@ -23736 +24566 @@
  ==============================================================================
  2. Scrollbars                                          *gui-scrollbars*
-@@ -156,26 +165,26 @@
+@@ -156,26 +171,26 @@
  
  The interface looks like this (with ":set guioptions=mlrb"):
@@ -23785 +24615 @@
 diff -Naur vim73.orig/runtime/doc/gui_w16.txt vim73/runtime/doc/gui_w16.txt
 --- vim73.orig/runtime/doc/gui_w16.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/gui_w16.txt       2013-06-07 17:07:08.715650453 +0000
++++ vim73/runtime/doc/gui_w16.txt       2013-08-04 19:09:07.837285533 +0000
 @@ -16,7 +16,7 @@
  
@@ -23797 +24627 @@
 diff -Naur vim73.orig/runtime/doc/gui_w32.txt vim73/runtime/doc/gui_w32.txt
 --- vim73.orig/runtime/doc/gui_w32.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/gui_w32.txt       2013-06-07 17:07:08.755650339 +0000
++++ vim73/runtime/doc/gui_w32.txt       2013-08-04 19:09:07.837285533 +0000
 @@ -1,4 +1,4 @@
 -*gui_w32.txt*   For Vim version 7.3.  Last change: 2007 Aug 30
@@ -23853 +24683 @@
 diff -Naur vim73.orig/runtime/doc/gui_x11.txt vim73/runtime/doc/gui_x11.txt
 --- vim73.orig/runtime/doc/gui_x11.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/gui_x11.txt       2013-06-07 17:07:08.765650311 +0000
++++ vim73/runtime/doc/gui_x11.txt       2013-08-04 19:09:07.840618856 +0000
 @@ -1,4 +1,4 @@
 -*gui_x11.txt*   For Vim version 7.3.  Last change: 2010 Jul 20
@@ -23871 +24701 @@
 diff -Naur vim73.orig/runtime/doc/hebrew.txt vim73/runtime/doc/hebrew.txt
 --- vim73.orig/runtime/doc/hebrew.txt   2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/hebrew.txt        2013-06-07 17:07:08.812316844 +0000
++++ vim73/runtime/doc/hebrew.txt        2013-08-04 19:09:07.843952179 +0000
 @@ -93,7 +93,7 @@
        This is also the keymap when 'keymap=hebrew' is set.  The advantage of
@@ -23883 +24713 @@
 diff -Naur vim73.orig/runtime/doc/help.txt vim73/runtime/doc/help.txt
 --- vim73.orig/runtime/doc/help.txt     2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/help.txt  2013-06-07 17:07:08.822316815 +0000
++++ vim73/runtime/doc/help.txt  2013-08-04 19:09:07.843952179 +0000
 @@ -1,4 +1,4 @@
 -*help.txt*     For Vim version 7.3.  Last change: 2010 Jul 20
@@ -23910 +24740 @@
 diff -Naur vim73.orig/runtime/doc/helphelp.txt vim73/runtime/doc/helphelp.txt
 --- vim73.orig/runtime/doc/helphelp.txt 2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/helphelp.txt      2013-06-07 17:07:08.842316758 +0000
++++ vim73/runtime/doc/helphelp.txt      2013-08-04 19:09:07.847285503 +0000
 @@ -1,4 +1,4 @@
 -*helphelp.txt* For Vim version 7.3.  Last change: 2010 Jul 29
@@ -23971 +24801 @@
 diff -Naur vim73.orig/runtime/doc/if_cscop.txt vim73/runtime/doc/if_cscop.txt
 --- vim73.orig/runtime/doc/if_cscop.txt 2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/if_cscop.txt      2013-06-07 17:07:08.862316701 +0000
++++ vim73/runtime/doc/if_cscop.txt      2013-08-04 19:09:07.850618826 +0000
 @@ -1,4 +1,4 @@
 -*if_cscop.txt*  For Vim version 7.3.  Last change: 2009 Mar 18
@@ -24027 +24857 @@
 diff -Naur vim73.orig/runtime/doc/if_lua.txt vim73/runtime/doc/if_lua.txt
 --- vim73.orig/runtime/doc/if_lua.txt   2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/if_lua.txt        2013-06-07 17:07:08.868983349 +0000
++++ vim73/runtime/doc/if_lua.txt        2013-08-04 19:09:07.853952149 +0000
 @@ -1,4 +1,4 @@
 -*if_lua.txt*    For Vim version 7.3.  Last change: 2010 Jul 22
@@ -24034 +24864 @@
  
                   VIM REFERENCE MANUAL    by Luis Carvalho
-@@ -8,8 +8,11 @@
+@@ -8,8 +8,12 @@
  
  1. Commands                    |lua-commands|
@@ -24042 +24872 @@
 +3. List userdata               |lua-list|
 +4. Dict userdata               |lua-dict|
-+5. Buffer userdata             |lua-buffer|
-+6. Window userdata             |lua-window|
-+7. The luaeval function                |lua-luaeval|
++5. Funcref userdata            |lua-funcref|
++6. Buffer userdata             |lua-buffer|
++7. Window userdata             |lua-window|
++8. The luaeval function                |lua-luaeval|
  
  {Vi does not have any of these commands}
  
-@@ -56,13 +59,14 @@
+@@ -56,13 +60,14 @@
  <
  
@@ -24070 +24901 @@
  Examples:
  >
-@@ -88,11 +92,9 @@
+@@ -88,11 +93,9 @@
  All these commands execute a Lua chunk from either the command line (:lua and
  :luado) or a file (:luafile) with the given line [range]. Similarly to the Lua
@@ -24085 +24916 @@
  Lua uses the "vim" module (see |lua-vim|) to issue commands to Vim
  and manage buffers (|lua-buffer|) and windows (|lua-window|). However,
-@@ -108,9 +110,9 @@
+@@ -108,9 +111,31 @@
  module also includes routines for buffer, window, and current line queries,
  Vim evaluation and command execution, and others.
@@ -24092 +24923 @@
 -                               "value" is a buffer userdata and 'false'
 -                               otherwise (see |lua-buffer|).
-+       vim.list()              Returns an empty list (see |List|).
-+
-+       vim.dict()              Returns an empty dictionary (see |Dictionary|).
++       vim.list([arg])         Returns an empty list or, if "arg" is a Lua
++                               table with numeric keys 1, ..., n (a
++                               "sequence"), returns a list l such that l[i] =
++                               arg[i] for i = 1, ..., n (see |List|).
++                               Non-numeric keys are not used to initialize
++                               the list. See also |lua-eval| for conversion
++                               rules. Example: >
++                                       :lua t = {math.pi, false, say = 'hi'}
++                                       :echo luaeval('vim.list(t)')
++                                       :" [3.141593, 0], 'say' is ignored
++<
++       vim.dict([arg])         Returns an empty dictionary or, if "arg" is a
++                               Lua table, returns a dict d such that d[k] =
++                               arg[k] for all string keys k in "arg" (see
++                               |Dictionary|). Number keys are converted to
++                               strings. Keys that are not strings are not
++                               used to initialize the dictionary. See also
++                               |lua-eval| for conversion rules. Example: >
++                                       :lua t = {math.pi, false, say = 'hi'}
++                                       :echo luaeval('vim.dict(t)')
++                                       :" {'say': 'hi'}, numeric keys ignored
++<
++       vim.funcref({name})     Returns a Funcref to function {name} (see
++                               |Funcref|). It is equivalent to Vim's
++                               "function".
  
         vim.buffer([arg])       If "arg" is a number, returns buffer with
                                 number "arg" in the buffer list or, if "arg"
-@@ -121,16 +123,21 @@
+@@ -121,16 +146,21 @@
                                 'true' returns the first buffer in the buffer
                                 list or else the current buffer.
@@ -24114 +24967 @@
 +       vim.type({arg})         Returns the type of {arg}. It is equivalent to
 +                               Lua's "type" function, but returns "list",
-+                               "dict", "buffer", or "window" if {arg} is a
-+                               list, dictionary, buffer, or window,
-+                               respectively. Examples: >
++                               "dict", "funcref", "buffer", or "window" if
++                               {arg} is a list, dictionary, funcref, buffer,
++                               or window, respectively. Examples: >
 +                                       :lua l = vim.list()
 +                                       :lua print(type(l), vim.type(l))
@@ -24124 +24977 @@
                                 Examples: >
                                         :lua vim.command"set tw=60"
-@@ -141,7 +148,7 @@
+@@ -141,7 +171,7 @@
                                 Vim strings and numbers are directly converted
                                 to Lua strings and numbers respectively. Vim
@@ -24133 +24986 @@
                                         :lua tw = vim.eval"&tw"
                                         :lua print(vim.eval"{'a': 'one'}".a)
-@@ -157,7 +164,72 @@
+@@ -157,7 +187,105 @@
  
  
@@ -24203 +25056 @@
 +
 +==============================================================================
-+5. Buffer userdata                                     *lua-buffer*
++5. Funcref userdata                                    *lua-funcref*
++
++Funcref userdata represent funcref variables in Vim. Funcrefs that were
++defined with a "dict" attribute need to be obtained as a dictionary key
++in order to have "self" properly assigned to the dictionary (see examples
++below.) A funcref "f" has the following properties:
++
++Properties
++----------
++       o "#f" is the name of the function referenced by "f"
++       o "f(...)" calls the function referenced by "f" (with arguments)
++
++Examples:
++>
++       :function I(x)
++       :  return a:x
++       :  endfunction
++       :let R = function('I')
++       :lua i1 = vim.funcref('I')
++       :lua i2 = vim.eval('R')
++       :lua print(#i1, #i2) -- both 'I'
++       :lua print(i1, i2, #i2(i1) == #i1(i2))
++       :function Mylen() dict
++       :  return len(self.data)
++       :  endfunction
++       :let mydict = {'data': [0, 1, 2, 3]}
++       :lua d = vim.eval('mydict'); d.len = vim.funcref('Mylen')
++       :echo mydict.len()
++       :lua l = d.len -- assign d as 'self'
++       :lua print(l())
++<
++
++==============================================================================
++6. Buffer userdata                                     *lua-buffer*
  
  Buffer userdata represent vim buffers. A buffer userdata "b" has the following
  properties and methods:
-@@ -209,7 +281,7 @@
+@@ -209,7 +337,7 @@
  <
  
  ==============================================================================
 -4. Window userdata                                     *lua-window*
-+6. Window userdata                                     *lua-window*
++7. Window userdata                                     *lua-window*
  
  Window objects represent vim windows. A window userdata "w" has the following
  properties and methods:
-@@ -241,4 +313,29 @@
+@@ -241,4 +369,35 @@
  <
  
  ==============================================================================
 - vim:tw=78:ts=8:ft=help:norl:
-+7. The luaeval function                                        *lua-luaeval* *lua-eval*
++8. The luaeval function                                        *lua-luaeval* *lua-eval*
 +
 +The (dual) equivalent of "vim.eval" for passing Lua values to Vim is
@@ -24233 +25119 @@
 +       end
 +<
-+Note that "_A" receives the argument to "luaeval". Examples: >
++Note that "_A" receives the argument to "luaeval". Lua numbers, strings, and
++list, dict, and funcref userdata are converted to their Vim respective types,
++while Lua booleans are converted to numbers. An error is thrown if conversion
++of any of the remaining Lua types, including userdata other than lists, dicts,
++and funcrefs, is attempted.
++
++Examples: >
 +
 +       :echo luaeval('math.pi')
@@ -24249 +25141 @@
 diff -Naur vim73.orig/runtime/doc/if_mzsch.txt vim73/runtime/doc/if_mzsch.txt
 --- vim73.orig/runtime/doc/if_mzsch.txt 2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/if_mzsch.txt      2013-06-07 17:07:08.878983320 +0000
++++ vim73/runtime/doc/if_mzsch.txt      2013-08-04 19:09:07.853952149 +0000
 @@ -1,4 +1,4 @@
 -*if_mzsch.txt*  For Vim version 7.3.  Last change: 2010 Feb 11
@@ -24328 +25220 @@
 diff -Naur vim73.orig/runtime/doc/if_perl.txt vim73/runtime/doc/if_perl.txt
 --- vim73.orig/runtime/doc/if_perl.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/if_perl.txt       2013-06-07 17:07:08.902316587 +0000
++++ vim73/runtime/doc/if_perl.txt       2013-08-04 19:09:07.857285472 +0000
 @@ -1,4 +1,4 @@
 -*if_perl.txt*   For Vim version 7.3.  Last change: 2010 Jul 21
@@ -24368 +25260 @@
 diff -Naur vim73.orig/runtime/doc/if_pyth.txt vim73/runtime/doc/if_pyth.txt
 --- vim73.orig/runtime/doc/if_pyth.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/if_pyth.txt       2013-06-07 17:07:08.912316559 +0000
++++ vim73/runtime/doc/if_pyth.txt       2013-08-04 19:09:07.860618796 +0000
 @@ -1,4 +1,4 @@
 -*if_pyth.txt*   For Vim version 7.3.  Last change: 2010 Aug 13
-+*if_pyth.txt*   For Vim version 7.3.  Last change: 2013 Jun 02
++*if_pyth.txt*   For Vim version 7.3.  Last change: 2013 Jun 28
  
  
@@ -24438 +25330 @@
  :[range]pyf[ile] {file}
                         Execute the Python script in {file}.  The whole
-@@ -150,7 +171,21 @@
+@@ -150,7 +171,27 @@
         [{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name':
         'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}]
@@ -24451 +25343 @@
 +       Like |strwidth()|: returns number of display cells str occupies, tab 
 +       is counted as one cell.
++
++vim.foreach_rtp(callable)                              *python-foreach_rtp*
++       Call the given callable for each path in 'runtimepath' until either 
++       callable returns something but None, the exception is raised or there 
++       are no longer paths. If stopped in case callable returned non-None, 
++       vim.foreach_rtp function returns the value returned by callable.
 +
 +vim.chdir(*args, **kwargs)                             *python-chdir*
@@ -24461 +25359 @@
  Error object of the "vim" module
  
-@@ -170,12 +205,12 @@
+@@ -170,12 +211,12 @@
         to which the variables referred.
  
@@ -24476 +25374 @@
  vim.windows                                            *python-windows*
         A sequence object providing access to the list of vim windows.  The
-@@ -184,13 +219,28 @@
+@@ -184,13 +225,28 @@
             :py w in vim.windows        # Membership test
             :py n = len(vim.windows)    # Number of elements
@@ -24507 +25405 @@
  
         The last case deserves a little explanation.  When the :python or
-@@ -198,6 +248,42 @@
+@@ -198,6 +254,42 @@
         "current range".  A range is a bit like a buffer, but with all access
         restricted to a subset of lines.  See |python-range| for more details.
@@ -24550 +25448 @@
  Output from Python                                     *python-output*
         Vim displays all Python code output in the Vim message area.  Normal
-@@ -222,8 +308,9 @@
+@@ -214,6 +306,88 @@
+        supported, and may cause the program to crash.  This should probably be
+        fixed.
+ 
++                   *python2-directory* *python3-directory* *pythonx-directory*
++Python 'runtimepath' handling                          *python-special-path*
++
++In python vim.VIM_SPECIAL_PATH special directory is used as a replacement for 
++the list of paths found in 'runtimepath': with this directory in sys.path and 
++vim.path_hooks in sys.path_hooks python will try to load module from 
++{rtp}/python2 (or python3) and {rtp}/pythonx (for both python versions) for 
++each {rtp} found in 'runtimepath'.
++
++Implementation is similar to the following, but written in C: >
++
++    from imp import find_module, load_module
++    import vim
++    import sys
++
++    class VimModuleLoader(object):
++        def __init__(self, module):
++            self.module = module
++
++        def load_module(self, fullname, path=None):
++            return self.module
++
++    def _find_module(fullname, oldtail, path):
++        idx = oldtail.find('.')
++        if idx > 0:
++            name = oldtail[:idx]
++            tail = oldtail[idx+1:]
++            fmr = find_module(name, path)
++            module = load_module(fullname[:-len(oldtail)] + name, *fmr)
++            return _find_module(fullname, tail, module.__path__)
++        else:
++            fmr = find_module(fullname, path)
++            return load_module(fullname, *fmr)
++
++    # It uses vim module itself in place of VimPathFinder class: it does not 
++    # matter for python which object has find_module function attached to as 
++    # an attribute.
++    class VimPathFinder(object):
++        @classmethod
++        def find_module(cls, fullname, path=None):
++            try:
++                return VimModuleLoader(_find_module(fullname, fullname, path or vim._get_paths()))
++            except ImportError:
++                return None
++
++        @classmethod
++        def load_module(cls, fullname, path=None):
++            return _find_module(fullname, fullname, path or vim._get_paths())
++
++    def hook(path):
++        if path == vim.VIM_SPECIAL_PATH:
++            return VimPathFinder
++        else:
++            raise ImportError
++
++    sys.path_hooks.append(hook)
++
++vim.VIM_SPECIAL_PATH                                   *python-VIM_SPECIAL_PATH*
++       String constant used in conjunction with vim path hook. If path hook 
++       installed by vim is requested to handle anything but path equal to 
++       vim.VIM_SPECIAL_PATH constant it raises ImportError. In the only other 
++       case it uses special loader.
++
++       Note: you must not use value of this constant directly, always use 
++             vim.VIM_SPECIAL_PATH object.
++
++vim.find_module(...)                                   *python-find_module*
++vim.path_hook(path)                                    *python-path_hook*
++       Methods or objects used to implement path loading as described above. 
++       You should not be using any of these directly except for vim.path_hook 
++       in case you need to do something with sys.meta_path. It is not 
++       guaranteed that any of the objects will exist in the future vim 
++       versions.
++
++vim._get_paths                                         *python-_get_paths*
++       Methods returning a list of paths which will be searched for by path 
++       hook. You should not rely on this method being present in future 
++       versions, but can use it for debugging.
++
++       It returns a list of {rtp}/python2 (or {rtp}/python3) and 
++       {rtp}/pythonx directories for each {rtp} in 'runtimepath'.
++
+ ==============================================================================
+ 3. Buffer objects                                      *python-buffer*
+ 
+@@ -222,8 +396,9 @@
         - from indexing vim.buffers (|python-buffers|)
         - from the "buffer" attribute of a window (|python-window|)
@@ -24562 +25549 @@
  You can also treat buffer objects as sequence objects.  In this context, they
  act as if they were lists (yes, they are mutable) of strings, with each
-@@ -238,6 +325,24 @@
+@@ -238,6 +413,24 @@
  line numbers, which start from 1.  This is particularly relevant when dealing
  with marks (see below) which use vim line numbers.
@@ -24587 +25574 @@
         b.append(str)   Append a line to the buffer
         b.append(str, nr)  Idem, below line "nr"
-@@ -256,6 +361,8 @@
+@@ -256,6 +449,8 @@
  A trailing '\n' is allowed and ignored, so that you can do: >
         :py b.append(f.readlines())
@@ -24596 +25583 @@
         :py print b.name                # write the buffer file name
         :py b[0] = "hello!!!"           # replace the top line
-@@ -267,6 +374,9 @@
+@@ -267,6 +462,9 @@
         :py n = len(b)                  # number of lines
         :py (row,col) = b.mark('a')     # named mark
@@ -24606 +25593 @@
  ==============================================================================
  4. Range objects                                       *python-range*
-@@ -294,6 +404,8 @@
+@@ -294,6 +492,8 @@
                         for Python's built-in list objects.
         r.append(list, nr)  Idem, after line "nr"
@@ -24615 +25602 @@
         # Send all lines in a range to the default printer
         vim.command("%d,%dhardcopy!" % (r.start+1,r.end+1))
-@@ -304,6 +416,8 @@
+@@ -304,6 +504,8 @@
  Window objects represent vim windows.  You can obtain them in a number of ways:
         - via vim.current.window (|python-current|)
@@ -24624 +25611 @@
  You can manipulate window objects only through their attributes.  They have no
  methods, and no sequence or other interface.
-@@ -314,11 +428,167 @@
+@@ -314,11 +516,167 @@
                                 This is a tuple, (row,col).
         height (read-write)     The window height, in rows
@@ -24654 +25641 @@
 +Window object type is available using "Window" attribute of vim module.
 +
-+==============================================================================
+ ==============================================================================
+-6. Dynamic loading                                     *python-dynamic*
 +6. Tab page objects                                    *python-tabpage*
 +
@@ -24787 +25775 @@
 +functions to evaluate Python expressions and pass their values to VimL.
 +
- ==============================================================================
--6. Dynamic loading                                     *python-dynamic*
++==============================================================================
 +9. Dynamic loading                                     *python-dynamic*
  
  On MS-Windows the Python library can be loaded dynamically.  The |:version|
  output then includes |+python/dyn|.
-@@ -335,12 +605,17 @@
+@@ -335,12 +693,17 @@
  sure edit "gvim.exe" and search for "python\d*.dll\c".
  
@@ -24815 +25802 @@
  Vim can be built in four ways (:version output):
  1. No Python support       (-python, -python3)
-@@ -355,7 +630,7 @@
+@@ -355,7 +718,7 @@
  When doing this on Linux/Unix systems and importing global symbols, this leads
  to a crash when the second Python version is used.  So either global symbols
@@ -24824 +25811 @@
                                                         *E836* *E837*
  Vim's configuration script makes a guess for all libraries based on one
-@@ -377,6 +652,18 @@
+@@ -377,6 +740,23 @@
  3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration.  This
     may crash Vim though.
  
++                                                       *E880*
++Raising SystemExit exception in python isn't endorsed way to quit vim, use: >
++       :py vim.command("qall!")
++<
++
 +                                                       *has-python*
 +You can test what Python version is available with: >
@@ -24845 +25837 @@
 diff -Naur vim73.orig/runtime/doc/if_ruby.txt vim73/runtime/doc/if_ruby.txt
 --- vim73.orig/runtime/doc/if_ruby.txt  2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/if_ruby.txt       2013-06-07 17:07:08.922316530 +0000
++++ vim73/runtime/doc/if_ruby.txt       2013-08-04 19:09:07.863952119 +0000
 @@ -1,4 +1,4 @@
 -*if_ruby.txt*   For Vim version 7.3.  Last change: 2010 Jul 20
@@ -24891 +25883 @@
 diff -Naur vim73.orig/runtime/doc/if_tcl.txt vim73/runtime/doc/if_tcl.txt
 --- vim73.orig/runtime/doc/if_tcl.txt   2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/if_tcl.txt        2013-06-07 17:07:08.952316444 +0000
++++ vim73/runtime/doc/if_tcl.txt        2013-08-04 19:09:07.867285442 +0000
 @@ -1,4 +1,4 @@
 -*if_tcl.txt*    For Vim version 7.3.  Last change: 2008 Aug 16
@@ -24911 +25903 @@
 diff -Naur vim73.orig/runtime/doc/indent.txt vim73/runtime/doc/indent.txt
 --- vim73.orig/runtime/doc/indent.txt   2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/indent.txt        2013-06-07 17:07:08.968983063 +0000
++++ vim73/runtime/doc/indent.txt        2013-08-04 19:09:07.867285442 +0000
 @@ -1,4 +1,4 @@
 -*indent.txt*    For Vim version 7.3.  Last change: 2010 Jul 30
-+*indent.txt*    For Vim version 7.3.  Last change: 2013 May 20
++*indent.txt*    For Vim version 7.3.  Last change: 2013 Jun 13
  
  
@@ -25383 +26375 @@
  Do loops ~
  All do loops are left unindented by default.  Do loops can be unstructured in
-@@ -537,6 +714,20 @@
+@@ -537,6 +714,64 @@
  to get do loops indented in .f90 files and left alone in Fortran files with
  other extensions such as .for.
@@ -25401 +26393 @@
 +  let b:fortran_indent_less=1
 +
++
++HTML                           *ft-html-indent* *html-indent* *html-indenting*
++
++This is about variables you can set in your vimrc to customize HTML indenting.
++
++You can set the indent for the first line after <script> and <style>
++"blocktags" (default "zero"): >
++
++      :let g:html_indent_script1 = "inc"
++      :let g:html_indent_style1 = "inc"
++<
++      VALUE    MEANING ~
++      "zero"   zero indent
++      "auto"   auto indent (same indent as the blocktag)
++      "inc"    auto indent + one indent step
++
++Many tags increase the indent for what follows per default (see "Add Indent
++Tags" in the script).  You can add further tags with: >
++
++      :let g:html_indent_inctags = "html,body,head,tbody"
++
++You can also remove such tags with: >
++
++      :let g:html_indent_autotags = "th,td,tr,tfoot,thead"
++
++Default value is empty for both variables.  Note: the initial "inctags" are
++only defined once per Vim session.
++
++User variables are only read when the script is sourced.  To enable your
++changes during a session, without reloading the HTML file, you can manually
++do: >
++
++      :call HtmlIndent_CheckUserSettings()
++
++Detail:
++  Calculation of indent inside "blocktags" with "alien" content:
++      BLOCKTAG   INDENT EXPR       WHEN APPLICABLE ~
++      <script> : {customizable}            if first line of block
++              : cindent(v:lnum)    if attributes empty or contain "java"
++              : -1                 else (vbscript, tcl, ...)
++      <style>  : {customizable}            if first line of block
++              : GetCSSIndent()     else
++      <!-- --> : -1
++
  
  PHP                            *ft-php-indent* *php-indent* *php-indenting*
  
-@@ -549,12 +740,12 @@
+@@ -549,12 +784,12 @@
      :%s /\r$//g
  
@@ -25419 +26455 @@
                                                                 *php-comment*
  To not enable auto-formating of comments by default (if you want to use your
-@@ -562,10 +753,21 @@
+@@ -562,10 +797,21 @@
      :let g:PHP_autoformatcomment = 0
  
@@ -25425 +26461 @@
 -added, see|fo-table|for more information.
 +added, see |fo-table| for more information.
-+-------------
-+
+ -------------
+ 
+-To add an extra indent to every PHP lines with N being the number of
 +To add extra indentation to single-line comments: >
 +    :let g:PHP_outdentSLComments = N
@@ -25436 +26473 @@
 +    // Comment
 +    /* Comment */
- -------------
- 
--To add an extra indent to every PHP lines with N being the number of
++-------------
++
 +To add extra indentation to every PHP lines with N being the number of
  'shiftwidth' to add: >
      :let g:PHP_default_indenting = N
  
-@@ -581,7 +783,7 @@
+@@ -581,7 +827,7 @@
  
         $command_hist = TRUE;
@@ -25452 +26488 @@
  
  To indent PHP tags as the surrounding code: >
-@@ -613,8 +815,10 @@
+@@ -613,8 +859,10 @@
  To indent 'case:' and 'default:' statements in switch() blocks: >
      :let g:PHP_vintage_case_default_indent = 1
@@ -25465 +26501 @@
  
  PYTHON                                                 *ft-python-indent*
-@@ -631,6 +835,43 @@
+@@ -631,6 +879,43 @@
         let g:pyindent_continue = '&sw * 2'
  
@@ -25511 +26547 @@
 diff -Naur vim73.orig/runtime/doc/index.txt vim73/runtime/doc/index.txt
 --- vim73.orig/runtime/doc/index.txt    2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/index.txt 2013-06-07 17:07:08.978983035 +0000
++++ vim73/runtime/doc/index.txt 2013-08-04 19:09:07.873952089 +0000
 @@ -1,4 +1,4 @@
 -*index.txt*     For Vim version 7.3.  Last change: 2010 Jul 21
-+*index.txt*     For Vim version 7.3.  Last change: 2013 Jun 06
++*index.txt*     For Vim version 7.3.  Last change: 2013 Jun 21
  
  
@@ -25625 +26661 @@
  |gv|           gv                 reselect the previous Visual area
  |gw|           gw{motion}      2  format Nmove text and keep cursor
-@@ -951,11 +958,13 @@
+@@ -794,6 +801,10 @@
+ |zE|           zE                 eliminate all folds
+ |zF|           zF                 create a fold for N lines
+ |zG|           zG                 mark word as good spelled word
++|zH|           zH                 when 'wrap' off scroll half a screenwidth
++                                  to the right
++|zL|           zL                 when 'wrap' off scroll half a screenwidth
++                                  to the left
+ |zM|           zM                 set 'foldlevel' to zero
+ |zN|           zN                 set 'foldenable'
+ |zO|           zO                 open folds recursively
+@@ -951,11 +962,13 @@
  "Completion" below refers to context-sensitive completion.  It will complete
  file names, tags, commands etc. as appropriate.
@@ -25640 +26687 @@
                                 front of the cursor
  |c_CTRL-E|     CTRL-E          cursor to end of command-line
-@@ -1004,8 +1013,8 @@
+@@ -1004,8 +1017,8 @@
                 CTRL-Z          not used (reserved for suspend)
  |c_<Esc>|      <Esc>           abandon command-line without executing it
@@ -25651 +26698 @@
                 CTRL-\ a - d    reserved for extensions
  |c_CTRL-\_e|   CTRL-\ e {expr} replace the command line with the result of
-@@ -1046,6 +1055,8 @@
+@@ -1046,6 +1059,8 @@
  mentioning any arguments.  The optional part of the command name is inside [].
  The commands are sorted on the non-optional part of their name.
@@ -25660 +26707 @@
  |:!!|          :!!             repeat last ":!" command
  |:#|           :#              same as ":number"
-@@ -1125,7 +1136,7 @@
+@@ -1125,7 +1140,7 @@
  |:cgetbuffer|  :cgetb[uffer]   get errors from buffer
  |:cgetexpr|    :cgete[xpr]     get errors from expr
@@ -25669 +26716 @@
  |:checkpath|   :che[ckpath]    list included files
  |:checktime|   :checkt[ime]    check timestamp of loaded buffers
-@@ -1256,7 +1267,7 @@
+@@ -1256,7 +1271,7 @@
  |:k|           :k              set a mark
  |:keepalt|     :keepa[lt]      following command keeps the alternate file
@@ -25678 +26725 @@
  |:lNfile|      :lNf[ile]       go to last entry in previous file
  |:list|                :l[ist]         print lines
-@@ -1374,7 +1385,7 @@
+@@ -1374,7 +1389,7 @@
  |:promptrepl|  :promptr[epl]   open GUI dialog for search/replace
  |:perldo|      :perld[o]       execute Perl command for each line
@@ -25687 +26734 @@
  |:preserve|    :pre[serve]     write all text to swap file
  |:previous|    :prev[ious]     go to previous file in argument list
-@@ -1392,8 +1403,10 @@
+@@ -1392,8 +1407,10 @@
  |:pwd|         :pw[d]          print current directory
  |:py3|         :py3            execute Python 3 command
@@ -25698 +26745 @@
  |:quit|                :q[uit]         quit current window (when one window quit Vim)
  |:quitall|     :quita[ll]      quit Vim
-@@ -1460,7 +1473,7 @@
+@@ -1460,7 +1477,7 @@
  |:slast|       :sla[st]        split window and go to last file in the
                                 argument list
@@ -25707 +26754 @@
  |:smenu|       :sme[nu]        add menu for Select mode
  |:snext|       :sn[ext]        split window and go to next file in the
-@@ -1497,6 +1510,7 @@
+@@ -1497,6 +1514,7 @@
  |:sview|       :sv[iew]        split window and edit file read-only
  |:swapname|    :sw[apname]     show the name of the current swap file
@@ -25717 +26764 @@
 diff -Naur vim73.orig/runtime/doc/insert.txt vim73/runtime/doc/insert.txt
 --- vim73.orig/runtime/doc/insert.txt   2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/insert.txt        2013-06-07 17:07:09.012316273 +0000
++++ vim73/runtime/doc/insert.txt        2013-08-04 19:09:07.877285412 +0000
 @@ -1,4 +1,4 @@
 -*insert.txt*    For Vim version 7.3.  Last change: 2010 Jul 29
-+*insert.txt*    For Vim version 7.3.  Last change: 2013 Apr 12
++*insert.txt*    For Vim version 7.3.  Last change: 2013 Jul 04
  
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -380,7 +380,16 @@
+@@ -136,6 +136,8 @@
+                                too.
+                                When the result is a Float it's automatically
+                                converted to a String.
++                               When append() or setline() is invoked the undo
++                               sequence will be broken.
+                See |registers| about registers.  {not in Vi}
+ 
+ CTRL-R CTRL-R {0-9a-z"%#*+/:.-=}                       *i_CTRL-R_CTRL-R*
+@@ -380,7 +382,16 @@
  end of the line, it will be put on the last character in the line.  In
  mappings it's often better to use <Esc> (first put an "x" in the text, <Esc>
@@ -25742 +26798 @@
  The shifted cursor keys are not available on all terminals.
  
-@@ -394,7 +403,12 @@
+@@ -394,7 +405,12 @@
  
  This redefines the backspace key to start a new undo sequence.  You can now
@@ -25756 +26812 @@
  Using CTRL-O splits undo: the text typed before and after it is undone
  separately.  If you want to avoid this (e.g., in a mapping) you might be able
-@@ -479,7 +493,7 @@
+@@ -479,7 +495,7 @@
                                                         *ins-smarttab*
  When the 'smarttab' option is on, a <Tab> inserts 'shiftwidth' positions at
@@ -25765 +26821 @@
  used for ">>" and the like.  {not in Vi}
  
-@@ -555,12 +569,11 @@
+@@ -555,12 +571,11 @@
  In 'list' mode, Virtual Replace mode acts as if it was not in 'list' mode,
  unless "L" is in 'cpoptions'.
@@ -25783 +26839 @@
  This mode is very useful for editing <Tab> separated columns in tables, for
  entering new data while keeping all the columns aligned.
-@@ -1006,8 +1019,13 @@
+@@ -1006,8 +1021,13 @@
  number between zero and the cursor column "col('.')".  This involves looking
  at the characters just before the cursor and including those characters that
@@ -25799 +26855 @@
  On the second invocation the arguments are:
     a:findstart  0
-@@ -1017,6 +1035,23 @@
+@@ -1017,6 +1037,23 @@
  The function must return a List with the matching words.  These matches
  usually include the "a:base" text.  When there are no matches return an empty
@@ -25823 +26879 @@
  Each list item can either be a string or a Dictionary.  When it is a string it
  is used as the completion.  When it is a Dictionary it can contain these
-@@ -1034,17 +1069,21 @@
+@@ -1034,17 +1071,21 @@
                         items that only differ in case are added
         dup             when non-zero this match will be added even when an
@@ -25849 +26905 @@
  The "kind" item uses a single letter to indicate the kind of completion.  This
  may be used to show the completion differently (different color or icon).
-@@ -1060,9 +1099,9 @@
+@@ -1060,9 +1101,9 @@
  list!  Call |complete_check()| now and then to allow the user to press a key
  while still searching for matches.  Stop searching when it returns non-zero.
@@ -25862 +26918 @@
  An example that completes the names of the months: >
         fun! CompleteMonths(findstart, base)
-@@ -1767,6 +1806,11 @@
+@@ -1429,9 +1470,9 @@
+ minimal language-sensitive completion.
+ 
+ To enable syntax code completion you can run: >
+-       setlocal omnifunc=syntaxcomplete#Complete
++    setlocal omnifunc=syntaxcomplete#Complete
+ 
+-You can automate this by placing the following in your vimrc (after any
++You can automate this by placing the following in your |.vimrc| (after any
+ ":filetype" command): >
+     if has("autocmd") && exists("+omnifunc")
+        autocmd Filetype *
+@@ -1448,7 +1489,7 @@
+ a look at the PHP filetype to see how this works.
+ 
+ If you edit a file called, index.php, run the following command: >
+-       :syntax list
++    syntax list
+ 
+ The first thing you will notice is that there are many different syntax groups.
+ The PHP language can include elements from different languages like HTML,
+@@ -1457,24 +1498,38 @@
+ groups are included by default with the PHP: phpEnvVar, phpIntVar,
+ phpFunctions.
+ 
++If you wish non-filetype syntax items to also be included, you can use a 
++regular expression syntax (added in version 13.0 of autoload\syntaxcomplete.vim)
++to add items.  Looking at the output from ":syntax list" while editing a PHP file 
++I can see some of these entries: >
++    htmlArg,htmlTag,htmlTagName,javaScriptStatement,javaScriptGlobalObjects
++
++To pick up any JavaScript and HTML keyword syntax groups while editing a PHP
++file, you can use 3 different regexs, one for each language.  Or you can 
++simply restrict the include groups to a particular value, without using 
++a regex string: >
++    let g:omni_syntax_group_include_php = 'php\w\+,javaScript\w\+,html\w\+'
++    let g:omni_syntax_group_include_php = 'phpFunctions,phpMethods'
++<
++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.  This means these items will be available within the omni
+-completion list.  Some people may find this list unwieldy or are only
+-interested in certain items.
++highlight.  These these items will be available within the omni completion
++list.  
+ 
+-There are two ways to prune this list (if necessary).  If you find certain
+-syntax groups you do not wish displayed you can add the following to your
+-vimrc: >
+-       let g:omni_syntax_group_exclude_php = 'phpCoreConstant,phpConstant'
++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
++certain syntax groups you do not wish displayed you can use two different 
++methods to identify these groups.  The first specifically lists the syntax 
++groups by name.  The second uses a regular expression to identify both 
++syntax groups.  Simply add one the following to your vimrc: >
++    let g:omni_syntax_group_exclude_php = 'phpCoreConstant,phpConstant'
++    let g:omni_syntax_group_exclude_php = 'php\w*Constant'
+ 
+ Add as many syntax groups to this list by comma separating them.  The basic
+ form of this variable is: >
+-       let g:omni_syntax_group_exclude_{filetype} = 'comma,separated,list'
+-
+-For completeness the opposite is also true.  Creating this variable in your
+-vimrc will only include the items in the phpFunctions and phpMethods syntax
+-groups: >
+-       let g:omni_syntax_group_include_php = 'phpFunctions,phpMethods'
++    let g:omni_syntax_group_exclude_{filetype} = 'regex,comma,separated'
+ 
+ You can create as many of these variables as you need, varying only the
+ filetype at the end of the variable name.
+@@ -1515,6 +1570,9 @@
+ To retrieve all syntax items for both the sqlOperator and sqlType groups: >
+     echo OmniSyntaxList( ['sqlOperator', 'sqlType'] )
+ 
++A regular expression can also be used: >
++    echo OmniSyntaxList( ['sql\w\+'] )
++
+ From within a plugin, you would typically assign the output to a List: >
+     let myKeywords = []
+     let myKeywords = OmniSyntaxList( ['sqlKeyword'] )
+@@ -1767,6 +1825,11 @@
  containing only a ".".  Watch out for lines starting with a backslash, see
  |line-continuation|.
@@ -25874 +27013 @@
  ":append" and ":insert" don't work properly in between ":if" and
  ":endif", ":for" and ":endfor", ":while" and ":endwhile".
-@@ -1825,13 +1869,15 @@
+@@ -1825,13 +1888,15 @@
                         See |++opt| for the possible values of [++opt].
  
@@ -25893 +27032 @@
 diff -Naur vim73.orig/runtime/doc/intro.txt vim73/runtime/doc/intro.txt
 --- vim73.orig/runtime/doc/intro.txt    2010-08-15 12:23:20.000000000 +0000
-+++ vim73/runtime/doc/intro.txt 2013-06-07 17:07:09.022316245 +0000
++++ vim73/runtime/doc/intro.txt 2013-08-04 19:09:07.880618736 +0000
 @@ -1,4 +1,4 @@
 -*intro.txt*     For Vim version 7.3.  Last change: 2010 Jul 20
-+*intro.txt*     For Vim version 7.3.  Last change: 2012 Sep 05
++*intro.txt*     For Vim version 7.3.  Last change: 2013 Jun 17
  
  
@@ -25913 +27052 @@
  from the time that is spent on improving Vim!  Always give a reproducible
  example and try to find out which settings or other things influence the
-@@ -300,7 +302,7 @@
+@@ -259,6 +261,7 @@
+ I wish to thank all the people that sent me bug reports and suggestions.  The
+ list is too long to mention them all here.  Vim would not be the same without
+ the ideas from all these people: They keep Vim alive!
++*love* *peace* *friendship* *gross-national-happiness*
+ 
+ 
+ In this documentation there are several references to other versions of Vi:
+@@ -300,7 +303,7 @@
  
  []             Characters in square brackets are optional.
@@ -25922 +27069 @@
                 or iterate the command.  If no number is given, a count of one
                 is used, unless otherwise noted.  Note that in this manual the
-@@ -392,6 +394,8 @@
+@@ -392,6 +395,8 @@
                                                         *quotecommandquote*
  "command"      A reference to a command that you can type is enclosed in
@@ -25931 +27078 @@
                                         *key-notation* *key-codes* *keycodes*
  These names for keys are used in the documentation.  They can also be used
-@@ -616,7 +620,6 @@
+@@ -616,7 +621,6 @@
  Command-line    *3       --      --     :start     --                --
  Ex              :vi      --      --     --         --        --
@@ -25939 +27086 @@
  
  *1 Go from Normal mode to Insert mode by giving the command "i", "I", "a",
-@@ -703,7 +706,7 @@
+@@ -703,7 +707,7 @@
  (see below).  The 'linebreak' option can be set to wrap at a blank character.
  
@@ -25948 +27095 @@
         +-----------------------+
         |some line              |
-@@ -715,7 +718,7 @@
+@@ -715,7 +719,7 @@
  Thus the '~' lines indicate that the end of the buffer was reached.
  
@@ -25957 +27104 @@
         +-----------------------+
         |first line             |
-@@ -730,7 +733,7 @@
+@@ -730,7 +734,7 @@
  When the "lastline" flag is present in the 'display' option, you will not see
  '@' characters at the left side of window.  If the last line doesn't fit
@@ -25968 +27115 @@
 diff -Naur vim73.orig/runtime/doc/map.txt vim73/runtime/doc/map.txt
 --- vim73.orig/runtime/doc/map.txt      2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/map.txt   2013-06-07 17:07:09.045649511 +0000
++++ vim73/runtime/doc/map.txt   2013-08-04 19:09:07.887285382 +0000
 @@ -1,4 +1,4 @@
 -*map.txt*       For Vim version 7.3.  Last change: 2010 Jul 31
-+*map.txt*       For Vim version 7.3.  Last change: 2013 May 05
++*map.txt*       For Vim version 7.3.  Last change: 2013 Jun 29
  
  
@@ -25993 +27140 @@
  
  :map                           |mapmode-nvo|
-@@ -226,7 +228,7 @@
+@@ -157,9 +159,9 @@
+ 
+ 1.2 SPECIAL ARGUMENTS                                  *:map-arguments*
+ 
+-"<buffer>", "<silent>", "<special>", "<script>", "<expr>" and "<unique>" can
+-be used in any order.  They must appear right after the command, before any
+-other arguments.
++"<buffer>", "<nowait>", "<silent>", "<special>", "<script>", "<expr>" and
++"<unique>" can be used in any order.  They must appear right after the
++command, before any other arguments.
+ 
+                                *:map-local* *:map-<buffer>* *E224* *E225*
+ If the first argument to one of these commands is "<buffer>" the mapping will
+@@ -167,12 +169,23 @@
+        :map <buffer>  ,w  /[.,;]<CR>
+ Then you can map ",w" to something else in another buffer: >
+        :map <buffer>  ,w  /[#&!]<CR>
+-The local buffer mappings are used before the global ones.
++The local buffer mappings are used before the global ones.  See <nowait> below
++to make a short local mapping not taking effect when a longer global one
++exists.
+ The "<buffer>" argument can also be used to clear mappings: >
+        :unmap <buffer> ,w
+        :mapclear <buffer>
+ Local mappings are also cleared when a buffer is deleted, but not when it is
+ unloaded.  Just like local option values.
++Also see |map-precedence|.
++
++                                               *:map-<nowait>* *:map-nowait*
++When defining a buffer-local mapping for "," there may be a global mapping
++that starts with ",".  Then you need to type another character for Vim to know
++whether to use the "," mapping or the longer one.  To avoid this add the
++<nowait> argument.  Then the mapping will be used when it matches, Vim does
++not wait for more characters to be typed.  However, if the characters were
++already type they are used.
+ 
+                                                *:map-<silent>* *:map-silent*
+ To define a mapping which will not be echoed on the command line, add
+@@ -226,7 +239,7 @@
  
  For abbreviations |v:char| is set to the character that was typed to trigger
@@ -26002 +27187 @@
  Be very careful about side effects!  The expression is evaluated while
  obtaining characters, you may very well make the command dysfunctional.
-@@ -235,11 +237,18 @@
+@@ -235,11 +248,18 @@
  - Editing another buffer.
  - The |:normal| command.
@@ -26023 +27208 @@
         let counter = 0
         inoremap <expr> <C-L> ListItem()
-@@ -480,9 +489,9 @@
+@@ -480,9 +500,9 @@
  have to type CTRL-V two times).  Unfortunately, you cannot do this in a vimrc
  file.
@@ -26036 +27221 @@
         :map! <F8>  <Nop>
  <
-@@ -495,7 +504,7 @@
+@@ -495,7 +515,7 @@
         :set encoding=utf-8
  The mapping for <M-C> is defined with the latin1 encoding, resulting in a 0xc3
@@ -26045 +27230 @@
  
                                         *<Leader>* *mapleader*
-@@ -518,7 +527,7 @@
+@@ -518,7 +538,7 @@
  <LocalLeader> is just like <Leader>, except that it uses "maplocalleader"
  instead of "mapleader".  <LocalLeader> is to be used for mappings which are
@@ -26054 +27239 @@
  In a global plugin <Leader> should be used and in a filetype plugin
  <LocalLeader>.  "mapleader" and "maplocalleader" can be equal.  Although, if
-@@ -542,6 +551,7 @@
+@@ -542,6 +562,7 @@
         <Char-123>      character 123
         <Char-033>      character 27
@@ -26062 +27247 @@
  Upper and lowercase differences are ignored.
  
-@@ -934,11 +944,12 @@
+@@ -644,6 +665,17 @@
+ you type slowly, or your system is slow, reset the 'timeout' option.  Then you
+ might want to set the 'ttimeout' option.
+ 
++                                                       *map-precedence*
++Buffer-local mappings (defined using |:map-<buffer>|) take precedence over
++global mappings.  When a buffer-local mapping is the same as a global mapping,
++Vim will use the buffer-local mapping.  In addition, Vim will use a complete
++mapping immediately if it was defined with <nowait>, even if a longer mapping
++has the same prefix.  For example, given the following two mappings: >
++    :map <buffer> <nowait> \a   :echo "Local \a"<CR>
++    :map                   \abc :echo "Global \abc"<CR>
++When typing \a the buffer-local mapping will be used immediately.  Vim will
++not wait for more characters to see if the user might be typing \abc.
++
+                                                        *map-keys-fails*
+ There are situations where key codes might not be recognized:
+ - Vim can only read part of the key code.  Mostly this is only the first
+@@ -934,11 +966,12 @@
                         avoid that a typed {lhs} is expanded, since
                         command-line abbreviations apply here.
@@ -26076 +27279 @@
                                                 *:una* *:unabbreviate*
  :una[bbreviate] {lhs}  Remove abbreviation for {lhs} from the list.  If none
-@@ -948,12 +959,12 @@
+@@ -948,12 +981,12 @@
                         expansion insert a CTRL-V (type it twice).
  
@@ -26091 +27294 @@
                         in Vi}
  
-@@ -962,12 +973,12 @@
+@@ -962,12 +995,12 @@
                         in Vi}
  
@@ -26106 +27309 @@
  
                                                 *:iuna* *:iunabbrev*
-@@ -975,18 +986,18 @@
+@@ -975,18 +1008,18 @@
                         Vi}
  
@@ -26129 +27332 @@
  
                                                         *using_CTRL-V*
-@@ -1093,16 +1104,20 @@
+@@ -1093,16 +1126,20 @@
  
  For starters: See section |40.2| in the user manual.
@@ -26159 +27362 @@
  When using a user-defined command, the command can be abbreviated.  However, if
  an abbreviation is not unique, an error will be issued.  Furthermore, a
-@@ -1173,13 +1188,15 @@
+@@ -1173,13 +1210,15 @@
  command can take arguments, using the -nargs attribute.  Valid cases are:
  
@@ -26178 +27381 @@
  Note that arguments are used as text, not as expressions.  Specifically,
  "s:var" will use the script-local variable in the script where the command was
-@@ -1202,23 +1219,32 @@
+@@ -1202,23 +1241,33 @@
  
         -complete=augroup       autocmd groups
@@ -26205 +27408 @@
 +       -complete=sign          |:sign| suboptions
         -complete=syntax        syntax file names |'syntax'|
++       -complete=syntime       |:syntime| suboptions
         -complete=tag           tags
         -complete=tag_listfiles tags, file names are shown when CTRL-D is hit
@@ -26211 +27415 @@
         -complete=custom,{func} custom completion, defined via {func}
         -complete=customlist,{func} custom completion, defined via {func}
-@@ -1285,7 +1311,8 @@
+@@ -1285,7 +1334,8 @@
         -range      Range allowed, default is current line
         -range=%    Range allowed, default is whole file (1,$)
@@ -26223 +27427 @@
 diff -Naur vim73.orig/runtime/doc/mbyte.txt vim73/runtime/doc/mbyte.txt
 --- vim73.orig/runtime/doc/mbyte.txt    2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/mbyte.txt 2013-06-07 17:07:09.072316102 +0000
++++ vim73/runtime/doc/mbyte.txt 2013-08-04 19:09:07.890618706 +0000
 @@ -1,4 +1,4 @@
 -*mbyte.txt*     For Vim version 7.3.  Last change: 2010 Jul 26
@@ -26339 +27543 @@
 diff -Naur vim73.orig/runtime/doc/message.txt vim73/runtime/doc/message.txt
 --- vim73.orig/runtime/doc/message.txt  2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/message.txt       2013-06-07 17:07:09.098982692 +0000
++++ vim73/runtime/doc/message.txt       2013-08-04 19:09:07.893952029 +0000
 @@ -1,4 +1,4 @@
 -*message.txt*   For Vim version 7.3.  Last change: 2010 Aug 10
@@ -26393 +27597 @@
 diff -Naur vim73.orig/runtime/doc/mlang.txt vim73/runtime/doc/mlang.txt
 --- vim73.orig/runtime/doc/mlang.txt    2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/mlang.txt 2013-06-07 17:07:09.105649340 +0000
++++ vim73/runtime/doc/mlang.txt 2013-08-04 19:09:07.893952029 +0000
 @@ -1,4 +1,4 @@
 -*mlang.txt*     For Vim version 7.3.  Last change: 2010 Jul 20
@@ -26420 +27624 @@
 diff -Naur vim73.orig/runtime/doc/motion.txt vim73/runtime/doc/motion.txt
 --- vim73.orig/runtime/doc/motion.txt   2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/motion.txt        2013-06-07 17:07:09.138982578 +0000
++++ vim73/runtime/doc/motion.txt        2013-08-04 19:09:07.897285352 +0000
 @@ -1,4 +1,4 @@
 -*motion.txt*    For Vim version 7.3.  Last change: 2010 May 14
@@ -26558 +27762 @@
 diff -Naur vim73.orig/runtime/doc/netbeans.txt vim73/runtime/doc/netbeans.txt
 --- vim73.orig/runtime/doc/netbeans.txt 2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/netbeans.txt      2013-06-07 17:07:09.158982521 +0000
++++ vim73/runtime/doc/netbeans.txt      2013-08-04 19:09:07.900618676 +0000
 @@ -1,4 +1,4 @@
 -*netbeans.txt*  For Vim version 7.3.  Last change: 2010 Jul 20
@@ -26621 +27825 @@
 diff -Naur vim73.orig/runtime/doc/options.txt vim73/runtime/doc/options.txt
 --- vim73.orig/runtime/doc/options.txt  2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/options.txt       2013-06-07 17:07:09.192315759 +0000
++++ vim73/runtime/doc/options.txt       2013-08-04 19:09:07.913951969 +0000
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.3.  Last change: 2010 Aug 15
-+*options.txt*  For Vim version 7.3.  Last change: 2013 Jun 04
++*options.txt*  For Vim version 7.3.  Last change: 2013 Jun 29
  
  
@@ -26690 +27894 @@
  command, not when assigning a value to an option with ":let".
  
-@@ -684,6 +701,10 @@
+@@ -465,39 +482,42 @@
+ There are two forms of modelines.  The first form:
+        [text]{white}{vi:|vim:|ex:}[white]{options}
+ 
+-[text]         any text or empty
+-{white}                at least one blank character (<Space> or <Tab>)
+-{vi:|vim:|ex:} the string "vi:", "vim:" or "ex:"
+-[white]                optional white space
+-{options}      a list of option settings, separated with white space or ':',
+-               where each part between ':' is the argument for a ":set"
+-               command (can be empty)
++[text]                 any text or empty
++{white}                        at least one blank character (<Space> or <Tab>)
++{vi:|vim:|ex:}         the string "vi:", "vim:" or "ex:"
++[white]                        optional white space
++{options}              a list of option settings, separated with white space
++                       or ':', where each part between ':' is the argument
++                       for a ":set" command (can be empty)
+ 
+-Example:
++Examples:
+    vi:noai:sw=3 ts=6 ~
++   vim: tw=77 ~
+ 
+ The second form (this is compatible with some versions of Vi):
+ 
+-       [text]{white}{vi:|vim:|ex:}[white]se[t] {options}:[text]
++       [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
+ 
+-[text]         any text or empty
+-{white}                at least one blank character (<Space> or <Tab>)
+-{vi:|vim:|ex:} the string "vi:", "vim:" or "ex:"
+-[white]                optional white space
+-se[t]          the string "set " or "se " (note the space)
+-{options}      a list of options, separated with white space, which is the
+-               argument for a ":set" command
+-:              a colon
+-[text]         any text or empty
++[text]                 any text or empty
++{white}                        at least one blank character (<Space> or <Tab>)
++{vi:|vim:|Vim:|ex:}    the string "vi:", "vim:", "Vim:" or "ex:"
++[white]                        optional white space
++se[t]                  the string "set " or "se " (note the space); When
++                       "Vim" is used it must be "set".
++{options}              a list of options, separated with white space, which
++                       is the argument for a ":set" command
++:                      a colon
++[text]                 any text or empty
+ 
+-Example:
++Examples:
+    /* vim: set ai tw=75: */ ~
++   /* Vim: set ai tw=75: */ ~
+ 
+-The white space before {vi:|vim:|ex:} is required.  This minimizes the chance
+-that a normal word like "lex:" is caught.  There is one exception: "vi:" and
+-"vim:" can also be at the start of the line (for compatibility with version
+-3.0).  Using "ex:" at the start of the line will be ignored (this could be
+-short for "example:").
++The white space before {vi:|vim:|Vim:|ex:} is required.  This minimizes the
++chance that a normal word like "lex:" is caught.  There is one exception:
++"vi:" and "vim:" can also be at the start of the line (for compatibility with
++version 3.0).  Using "ex:" at the start of the line will be ignored (this
++could be short for "example:").
+ 
+                                                        *modeline-local*
+ The options are set like with ":setlocal": The new value only applies to the
+@@ -513,7 +533,7 @@
+ 
+                                                        *modeline-version*
+ If the modeline is only to be used for some versions of Vim, the version
+-number can be specified where "vim:" is used:
++number can be specified where "vim:" or "Vim:" is used:
+        vim{vers}:      version {vers} or later
+        vim<{vers}:     version before {vers}
+        vim={vers}:     version {vers}
+@@ -684,6 +704,10 @@
         when the system locale is set to one of CJK locales.  See Unicode
         Standard Annex #11 (http://www.unicode.org/reports/tr11).
@@ -26701 +27981 @@
  'antialias' 'anti'     boolean (default: off)
                         global
-@@ -729,7 +750,7 @@
+@@ -729,7 +753,7 @@
         - Reset the 'rightleft' option.
         - Disable the use of 'keymap' (without changing its value).
@@ -26710 +27990 @@
  
                                         *'arabicshape'* *'arshape'*
-@@ -741,7 +762,7 @@
+@@ -741,7 +765,7 @@
                         feature}
         When on and 'termbidi' is off, the required visual character
@@ -26719 +27999 @@
           a) the changing/morphing of characters based on their location
              within a word (initial, medial, final and stand-alone).
-@@ -802,7 +823,7 @@
+@@ -802,7 +826,7 @@
         been set.
  
@@ -26728 +28008 @@
                         {not in Vi}
         When set to "dark", Vim will try to use colors that look good on a
-@@ -836,6 +857,12 @@
+@@ -836,6 +860,12 @@
         color).  To get around this, force the GUI window to be opened by
         putting a ":gui" command in the .gvimrc file, before where the value
@@ -26741 +28021 @@
         depending on the terminal name.  Example: >
                 :if &term == "pcterm"
-@@ -965,7 +992,7 @@
+@@ -965,7 +995,7 @@
         - The backup file will be created in the first directory in the list
           where this is possible.  The directory must exist, Vim will not
@@ -26750 +28030 @@
         - A directory "." means to put the backup file in the same directory
           as the edited file.
-@@ -1026,6 +1053,11 @@
+@@ -1026,6 +1056,11 @@
         When $TMPDIR, $TMP or $TEMP is not defined, it is not used for the
         default value.  "/tmp/*" is only used for Unix.
@@ -26762 +28042 @@
         $HOME you must expand it explicitly, e.g.: >
                 :let backupskip = escape(expand('$HOME'), '\') . '/tmp/*'
-@@ -1081,8 +1113,8 @@
+@@ -1081,8 +1116,8 @@
         Vim does not try to send a message to an external debugger (Netbeans
         or Sun Workshop).
@@ -26773 +28053 @@
         It is not allowed to change text or jump to another window while
         evaluating 'balloonexpr' |textlock|.
-@@ -1198,7 +1230,8 @@
+@@ -1198,7 +1233,8 @@
                         |:bwipeout|
  
@@ -26783 +28063 @@
         special kinds of buffers.   See |special-buffers|.
  
-@@ -1425,6 +1458,7 @@
+@@ -1425,6 +1461,7 @@
         This option is a list of comma separated names.
         These names are recognized:
@@ -26791 +28071 @@
                         for all yank, delete, change and put operations which
                         would normally go to the unnamed register.  When a
-@@ -1434,6 +1468,20 @@
+@@ -1434,6 +1471,20 @@
                         explicitly accessed using the "* notation.  Also see
                         |gui-clipboard|.
@@ -26812 +28092 @@
                         then whenever Visual mode is started, or the Visual
                         area extended, Vim tries to become the owner of the
-@@ -1445,9 +1493,16 @@
+@@ -1445,9 +1496,16 @@
                         "autoselect" flag is used.
                         Also applies to the modeless selection.
@@ -26829 +28109 @@
                         pasting.  When putting text on the clipboard, mark it
                         as HTML.  This works to copy rendered HTML from
-@@ -1458,6 +1513,7 @@
+@@ -1458,6 +1516,7 @@
                         Only supported for GTK version 2 and later.
                         Only available with the |+multi_byte| feature.
@@ -26837 +28117 @@
                         Defines a pattern that is matched against the name of
                         the terminal 'term'.  If there is a match, no
-@@ -1496,6 +1552,25 @@
+@@ -1496,6 +1555,25 @@
                         feature}
         Number of screen lines to use for the command-line window. |cmdwin|
@@ -26863 +28143 @@
  'columns' 'co'         number  (default 80 or terminal width)
                         global
-@@ -1634,7 +1709,7 @@
+@@ -1634,7 +1712,7 @@
         when CTRL-P or CTRL-N are used.  It is also used for whole-line
         completion |i_CTRL-X_CTRL-L|.  It indicates the type of completion
@@ -26872 +28152 @@
         b       scan other loaded buffers that are in the buffer list
         u       scan the unloaded buffers that are in the buffer list
-@@ -1680,7 +1755,8 @@
+@@ -1680,7 +1758,8 @@
         with CTRL-X CTRL-U. |i_CTRL-X_CTRL-U|
         See |complete-functions| for an explanation of how the function is
@@ -26882 +28162 @@
                                                 *'completeopt'* *'cot'*
  'completeopt' 'cot'    string  (default: "menu,preview")
-@@ -2069,6 +2145,12 @@
+@@ -2069,6 +2148,12 @@
                                                                 *cpo->*
                 >       When appending to a register, put a line break before
@@ -26895 +28175 @@
         POSIX flags.  These are not included in the Vi default value, except
         when $VIM_POSIX was set on startup. |posix|
-@@ -2161,6 +2243,16 @@
+@@ -2161,6 +2246,16 @@
         Specifies whether to use quickfix window to show cscope results.
         See |cscopequickfix|.
  
-+                                               *'cscoperelative'* *'csre'*
++               *'cscoperelative'* *'csre'* *'nocscoperelative'* *'nocsre'*
 +'cscoperelative' 'csre' boolean (default off)
 +                       global
@@ -26912 +28192 @@
  'cscopetag' 'cst'      boolean (default off)
                         global
-@@ -2782,7 +2874,7 @@
+@@ -2782,7 +2877,7 @@
         See |file-formats| and |file-read|.
         For the character encoding of the file see 'fileencoding'.
@@ -26921 +28201 @@
         'fileformats' is not empty and 'binary' is off.
         When this option is set, after starting to edit a file, the 'modified'
-@@ -2817,13 +2909,14 @@
+@@ -2817,13 +2912,14 @@
           2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat'
              is set to "unix".  Note that when a <NL> is found without a
@@ -26943 +28223 @@
              'fileformats' is used.
           When reading a file into an existing buffer, the same is done, but
-@@ -2831,6 +2924,9 @@
+@@ -2831,6 +2927,9 @@
           file only, the option is not changed.
         When 'binary' is set, the value of 'fileformats' is not used.
@@ -26953 +28233 @@
         are ":source"ed and for vimrc files, automatic <EOL> detection may be
         done:
-@@ -2847,6 +2943,14 @@
+@@ -2847,6 +2946,14 @@
         NOTE: This option is set to the Vi default value when 'compatible' is
         set and to the Vim default value when 'compatible' is reset.
@@ -26968 +28248 @@
  'filetype' 'ft'                string (default: "")
                         local to buffer
-@@ -2871,8 +2975,6 @@
+@@ -2871,8 +2978,6 @@
         This will use the "c" filetype first, then the "doxygen" filetype.
         This works both for filetype plugins and for syntax files.  More than
@@ -26977 +28257 @@
         'S' flag in 'cpoptions'.
         Only normal file name characters can be used, "/\*?[|<>" are illegal.
-@@ -2966,8 +3068,8 @@
+@@ -2966,8 +3071,8 @@
         The expression used for when 'foldmethod' is "expr".  It is evaluated
         for each line to obtain its fold level.  See |fold-expr|.
@@ -26988 +28268 @@
         on.
  
-@@ -3044,9 +3146,11 @@
+@@ -3044,9 +3149,11 @@
                         {not in Vi}
                         {not available when compiled without the |+folding|
@@ -27003 +28283 @@
         than 'foldminlines', a following "zc" may close a containing fold.
  
-@@ -3070,6 +3174,10 @@
+@@ -3070,6 +3177,10 @@
         Specifies for which type of commands folds will be opened, if the
         command moves the cursor into a closed fold.  It is a comma separated
@@ -27014 +28294 @@
                 all             any
                 block           "(", "{", "[[", "[{", etc.
-@@ -3084,8 +3192,6 @@
+@@ -3084,8 +3195,6 @@
                                 Also for |[s| and |]s|.
                 tag             jumping to a tag: ":ta", CTRL-T, etc.
@@ -27023 +28303 @@
         this option is not used.  This means the operator will include the
         whole closed fold.
-@@ -3105,8 +3211,8 @@
+@@ -3105,8 +3214,8 @@
         An expression which is used to specify the text displayed for a closed
         fold.  See |fold-foldtext|.
@@ -27034 +28314 @@
         It is not allowed to change text or jump to another window while
         evaluating 'foldtext' |textlock|.
-@@ -3151,8 +3257,8 @@
+@@ -3151,8 +3260,8 @@
         format function will be used |C-indenting|.
         Environment variables are expanded |:set_env|.  See |option-backslash|
@@ -27045 +28325 @@
                                                 *'formatexpr'* *'fex'*
  'formatexpr' 'fex'     string (default "")
-@@ -3185,8 +3291,9 @@
+@@ -3185,8 +3294,9 @@
         When the expression evaluates to non-zero Vim will fall back to using
         the internal format mechanism.
@@ -27057 +28337 @@
                                                 *'fsync'* *'fs'*
  'fsync' 'fs'           boolean (default on)
-@@ -3338,7 +3445,7 @@
+@@ -3338,7 +3448,7 @@
             :highlight Cursor gui=NONE guifg=bg guibg=fg
  <
@@ -27066 +28346 @@
                         global
                         {not in Vi}
-@@ -3470,6 +3577,10 @@
+@@ -3470,6 +3580,10 @@
         to set 'guifontwide' at all unless you want to override the choice
         made by Pango/Xft.
@@ -27077 +28357 @@
  'guiheadroom' 'ghr'    number  (default 50)
                         global
-@@ -3483,8 +3594,8 @@
+@@ -3483,8 +3597,8 @@
         screen.
  
@@ -27088 +28368 @@
                         {not in Vi}
                         {only available when compiled with GUI enabled}
-@@ -3510,6 +3621,9 @@
+@@ -3510,6 +3624,9 @@
                 windowing system's global selection unless explicitly told to
                 by a yank or delete operation for the "* register.
@@ -27098 +28378 @@
           'A'   Autoselect for the modeless selection.  Like 'a', but only
                 applies to the modeless selection.
-@@ -3698,9 +3812,10 @@
+@@ -3698,9 +3815,10 @@
  'highlight' 'hl'       string  (default (as a single string):
                                      "8:SpecialKey,@:NonText,d:Directory,
@@ -27112 +28392 @@
                                      C:DiffChange,D:DiffDelete,T:DiffText,
                                      >:SignColumn,B:SpellBad,P:SpellCap,
-@@ -3726,6 +3841,8 @@
+@@ -3726,6 +3844,8 @@
         |hl-ModeMsg|     M  Mode (e.g., "-- INSERT --")
         |hl-LineNr|      n  line number for ":number" and ":#" commands, and
@@ -27121 +28401 @@
         |hl-StatusLine|  s  status line of current window |status-line|
         |hl-StatusLineNC| S  status lines of not-current windows
-@@ -3787,14 +3904,16 @@
+@@ -3787,14 +3907,16 @@
         are not applied.
         See also: 'incsearch' and |:match|.
@@ -27140 +28420 @@
  
                                                 *'history'* *'hi'*
-@@ -4003,8 +4122,8 @@
+@@ -3874,6 +3996,26 @@
+        Can be overruled by using "\c" or "\C" in the pattern, see
+        |/ignorecase|.
+ 
++                                               *'imactivatefunc'* *'imaf'*
++'imactivatefunc' 'imaf'        string (default "")
++                       global
++                       {not in Vi}
++                       {only available when compiled with |+xim| and
++                       |+GUI_GTK|}
++       This option specifies a function that will be called to
++       activate/inactivate Input Method.
++
++       Example: >
++               function ImActivateFunc(active)
++                 if a:active
++                   ... do something
++                 else
++                   ... do something
++                 endif
++                 " return value is not used
++               endfunction
++               set imactivatefunc=ImActivateFunc
++<
+                                                *'imactivatekey'* *'imak'*
+ 'imactivatekey' 'imak' string (default "")
+                        global
+@@ -3970,6 +4112,24 @@
+        The value 0 may not work correctly with Athena and Motif with some XIM
+        methods.  Use 'imdisable' to disable XIM then.
+ 
++                                               *'imstatusfunc'* *'imsf'*
++'imstatusfunc' 'imsf'  string (default "")
++                       global
++                       {not in Vi}
++                       {only available when compiled with |+xim| and
++                       |+GUI_GTK|}
++       This option specifies a function that is called to obtain the status
++       of Input Method.  It must return a positive number when IME is active.
++
++       Example: >
++               function ImStatusFunc()
++                 let is_active = ...do something
++                 return is_active ? 1 : 0
++               endfunction
++               set imstatusfunc=ImStatusFunc
++<
++       NOTE: This function is invoked very often.  Keep it fast.
++
+                                                *'include'* *'inc'*
+ 'include' 'inc'                string  (default "^\s*#\s*include")
+                        global or local to buffer |global-local|
+@@ -4003,8 +4163,8 @@
         found.  Allows doing "gf" on the name after an 'include' statement.
         Also used for |<cfile>|.
@@ -27151 +28483 @@
         It is not allowed to change text or jump to another window while
         evaluating 'includeexpr' |textlock|.
-@@ -4047,7 +4166,8 @@
+@@ -4047,7 +4207,8 @@
         It is used when a new line is created, for the |=| operator and
         in Insert mode as specified with the 'indentkeys' option.
@@ -27161 +28493 @@
         The expression is evaluated with |v:lnum| set to the line number for
         which the indent is to be computed.  The cursor is also in this line
-@@ -4067,8 +4187,8 @@
+@@ -4067,8 +4228,8 @@
         See |indent-expression|.
         NOTE: This option is made empty when 'compatible' is set.
@@ -27172 +28504 @@
         It is not allowed to change text or jump to another window while
         evaluating 'indentexpr' |textlock|.
-@@ -4270,6 +4390,8 @@
+@@ -4270,6 +4431,8 @@
         "echo &key".  This is to avoid showing it to someone who shouldn't
         know.  It also means you cannot see it yourself once you have set it,
@@ -27181 +28513 @@
                                         *'keymap'* *'kmp'* *E544*
  'keymap' 'kmp'         string  (default "")
-@@ -4495,24 +4617,31 @@
+@@ -4495,24 +4658,31 @@
                         {not in Vi}
         Strings to use in 'list' mode and for the |:list| command.  It is a
@@ -27213 +28545 @@
                         0xA0, 160).  Left blank when omitted.
  
-@@ -4601,32 +4730,15 @@
+@@ -4601,32 +4771,15 @@
  <      This option cannot be set from a |modeline| or in the |sandbox|, for
         security reasons.
@@ -27250 +28582 @@
         '>' (HTML): >
                 :set mps+=<:>
-@@ -4806,6 +4918,10 @@
+@@ -4806,6 +4959,10 @@
            written.  A ":set nomodified" command also resets the original
            values to the current values and the 'modified' option will be
@@ -27261 +28593 @@
         will be ignored.
  
-@@ -4994,7 +5110,7 @@
+@@ -4994,7 +5151,7 @@
         respectively; see |CTRL-A| for more info on these commands.
         alpha   If included, single alphabetical characters will be
@@ -27270 +28602 @@
                 to be octal.  Example: Using CTRL-A on "007" results in "010".
         hex     If included, numbers starting with "0x" or "0X" will be
-@@ -5014,8 +5130,20 @@
+@@ -5014,8 +5171,20 @@
         number.
         When a long, wrapped line doesn't start with the first character, '-'
@@ -27293 +28625 @@
                                                 *'numberwidth'* *'nuw'*
  'numberwidth' 'nuw'    number  (Vim default: 4  Vi default: 8)
-@@ -5047,6 +5175,8 @@
+@@ -5047,6 +5216,8 @@
         invoked and what it should return.
         This option is usually set by a filetype plugin:
@@ -27302 +28634 @@
  
                             *'opendevice'* *'odev'* *'noopendevice'* *'noodev'*
-@@ -5072,20 +5202,12 @@
+@@ -5072,20 +5243,12 @@
         security reasons.
  
@@ -27327 +28659 @@
                                                 *'paragraphs'* *'para'*
  'paragraphs' 'para'    string  (default "IPLPPPQPP TPHPLIPpLpItpplpipbp")
-@@ -5190,7 +5312,7 @@
+@@ -5190,7 +5353,7 @@
         recognized as a compressed file.
         Only normal file name characters can be used, "/\*?[|<>" are illegal.
@@ -27336 +28668 @@
                                    on OS/2:       ".,/emx/include,,"
                                    other systems: ".,,")
-@@ -5405,6 +5527,19 @@
+@@ -5405,6 +5568,19 @@
         matches will be highlighted.  This is used to avoid that Vim hangs
         when using a very complicated pattern.
@@ -27356 +28688 @@
  'relativenumber' 'rnu' boolean (default off)
                         local to window
-@@ -5421,8 +5556,12 @@
+@@ -5421,8 +5597,12 @@
         number.
         When a long, wrapped line doesn't start with the first character, '-'
@@ -27371 +28703 @@
                                                 *'remap'* *'noremap'*
  'remap'                        boolean (default on)
-@@ -5843,16 +5982,20 @@
+@@ -5843,16 +6023,20 @@
         security reasons.
  
@@ -27396 +28728 @@
         security reasons.
  
-@@ -5873,9 +6016,10 @@
+@@ -5873,9 +6057,10 @@
         For Unix the default it "| tee".  The stdout of the compiler is saved
         in a file and echoed to the screen.  If the 'shell' option is "csh" or
@@ -27410 +28742 @@
         and the other initializations, so that when the 'shell' option is set
         there, the 'shellpipe' option changes automatically, unless it was
-@@ -5954,7 +6098,8 @@
+@@ -5954,7 +6139,8 @@
                         {not in Vi}
         When on, use temp files for shell commands.  When off use a pipe.
@@ -27420 +28752 @@
  <      The advantage of using a pipe is that nobody can read the temp file
         and the 'shell' command does not need to support redirection.
-@@ -5978,8 +6123,18 @@
+@@ -5978,8 +6164,18 @@
         0 and 2: use "shell 'shellcmdflag' cmd" to start external commands
         1 and 3: use "shell cmd" to start external commands
@@ -27439 +28771 @@
                                         somewhere: "\""
                                         for Unix, when using system(): "\"")
-@@ -5989,11 +6144,15 @@
+@@ -5989,11 +6185,15 @@
         the "!" and ":!" commands.  Includes the redirection.  See
         'shellquote' to exclude the redirection.  It's probably not useful
@@ -27460 +28792 @@
         security reasons.
  
-@@ -6011,6 +6170,8 @@
+@@ -6011,6 +6211,8 @@
                         local to buffer
         Number of spaces to use for each step of (auto)indent.  Used for
@@ -27469 +28801 @@
                                                 *'shortmess'* *'shm'*
  'shortmess' 'shm'      string  (Vim default "filnxtToO", Vi default: "",
-@@ -6214,7 +6375,7 @@
+@@ -6214,7 +6416,7 @@
         Override the 'ignorecase' option if the search pattern contains upper
         case characters.  Only used when the search pattern is typed and
@@ -27478 +28810 @@
         recalling the search pattern from history and hitting <Enter>.
         NOTE: This option is reset when 'compatible' is set.
-@@ -6228,8 +6389,9 @@
+@@ -6228,8 +6430,9 @@
         Do smart autoindenting when starting a new line.  Works for C-like
         programs, but can also be used for other languages.  'cindent' does
@@ -27490 +28822 @@
         An indent is automatically inserted:
         - After a line ending in '{'.
-@@ -6273,6 +6435,7 @@
+@@ -6273,6 +6476,7 @@
         of 8, while being able to edit like it is set to 'sts'.  However,
         commands like "x" still work on the actual characters.
@@ -27498 +28830 @@
         See also |ins-expandtab|.  When 'expandtab' is not set, the number of
         spaces is minimized by using <Tab>s.
-@@ -6467,7 +6630,7 @@
+@@ -6467,7 +6671,7 @@
         where it was the last time the buffer was edited.
         NOTE: This option is set when 'compatible' is set.
@@ -27507 +28839 @@
                         global or local to window |global-local|
                         {not in Vi}
-@@ -6480,12 +6643,15 @@
+@@ -6480,12 +6684,15 @@
         normal text.  Each status line item is of the form:
           %-0{minwid}.{maxwid}{item}
@@ -27524 +28856 @@
         When there is error while evaluating the option then it will be made
         empty to avoid further errors.  Otherwise screen updating would loop.
-@@ -6533,7 +6699,7 @@
+@@ -6533,7 +6740,7 @@
         k S   Value of "b:keymap_name" or 'keymap' when |:lmap| mappings are
               being used: "<keymap>"
@@ -27533 +28865 @@
         o N   Byte number in file of byte under cursor, first byte is 1.
               Mnemonic: Offset from start of file (with one added)
-@@ -6591,8 +6757,8 @@
+@@ -6547,7 +6754,8 @@
+        V N   Virtual column number as -{num}.  Not displayed if equal to 'c'.
+        p N   Percentage through file in lines as in |CTRL-G|.
+        P S   Percentage through file of displayed window.  This is like the
+-             percentage described for 'ruler'.  Always 3 in length.
++             percentage described for 'ruler'.  Always 3 in length, unless
++             translated.
+        a S   Argument list status as in default title.  ({current} of {max})
+              Empty if the argument file count is zero or one.
+        { NF  Evaluate expression between '%{' and '}' and substitute result.
+@@ -6591,8 +6799,8 @@
         The variable "actual_curbuf" is set to the 'bufnr()' number of the
         real current buffer.
@@ -27544 +28886 @@
         It is not allowed to change text or jump to another window while
         evaluating 'statusline' |textlock|.
-@@ -6705,8 +6871,8 @@
+@@ -6705,8 +6913,8 @@
            usetab       Like "useopen", but also consider windows in other tab
                         pages.
@@ -27555 +28897 @@
                         "split" when both are present.
  
-@@ -6960,7 +7126,7 @@
+@@ -6960,7 +7168,7 @@
                         {not in Vi}
         Encoding used for the terminal.  This specifies what character
@@ -27564 +28906 @@
         'termencoding' should be "macroman".
         In the Win32 console version the default value is the console codepage
-@@ -7035,8 +7201,8 @@
+@@ -7035,8 +7243,8 @@
         the file should contain words with similar meaning, separated by
         non-keyword characters (white space is preferred).  Maximum line
@@ -27575 +28917 @@
         after a comma are ignored, otherwise spaces are included in the file
         name.  See |option-backslash| about using backslashes.
-@@ -7311,6 +7477,12 @@
+@@ -7311,6 +7519,12 @@
            jsbterm      JSB term mouse handling.
                                                         *pterm-mouse*
@@ -27588 +28930 @@
         The mouse handling must be enabled at compile time |+mouse_xterm|
         |+mouse_dec| |+mouse_netterm|.
-@@ -7323,6 +7495,7 @@
+@@ -7323,6 +7537,7 @@
         or "xterm2" already.  The main use of this option is to set it to
         "xterm", when the terminal name doesn't start with "xterm", but it can
@@ -27596 +28938 @@
         95 or higher.  This only works when compiled with the |+termresponse|
         feature and if |t_RV| is set to the escape sequence to request the
-@@ -7362,7 +7535,7 @@
+@@ -7362,7 +7577,7 @@
         given, no further entry is used.
         See |undo-persistence|.
@@ -27605 +28947 @@
                         local to buffer
                         {not in Vi}
-@@ -7374,7 +7547,7 @@
+@@ -7374,7 +7589,7 @@
         For more information about this feature see |undo-persistence|.
         The undo file is not read when 'undoreload' causes the buffer from
@@ -27614 +28956 @@
                                                 *'undolevels'* *'ul'*
  'undolevels' 'ul'      number  (default 100, 1000 for Unix, VMS,
-@@ -7527,15 +7700,18 @@
+@@ -7527,15 +7742,18 @@
         parameter.  The following is a list of the identifying characters and
         the effect of their value.
@@ -27635 +28977 @@
                 started with a file name argument, the buffer list is not
                 restored.  If Vim is started without a file name argument, the
-@@ -7545,38 +7721,48 @@
+@@ -7545,38 +7763,48 @@
                 When followed by a number, the number specifies the maximum
                 number of buffers that are stored.  Without a number all
@@ -27684 +29026 @@
                 ',').  This parameter can be given several times.  Each
                 specifies the start of a path for which no marks will be
-@@ -7585,6 +7771,7 @@
+@@ -7585,6 +7813,7 @@
                 also use it for temp files, e.g., for Unix: "r/tmp".  Case is
                 ignored.  Maximum length of each 'r' argument is 50
@@ -27692 +29034 @@
                 not saved.  Currently only applies to registers.  The default
                 "s10" will exclude registers with more than 10 Kbyte of text.
-@@ -7736,9 +7923,9 @@
+@@ -7736,9 +7965,9 @@
                         {not available when compiled without the |+wildignore|
                         feature}
@@ -27705 +29047 @@
         Also see 'suffixes'.
         Example: >
-@@ -7747,6 +7934,17 @@
+@@ -7747,6 +7976,17 @@
         a pattern from the list.  This avoids problems when a future version
         uses another default.
@@ -27723 +29065 @@
  'wildmenu' 'wmnu'      boolean (default off)
                         global
-@@ -7761,6 +7959,7 @@
+@@ -7761,6 +8001,7 @@
         CTRL-P/CTRL-N, cause the highlight to move to the appropriate match.
         When 'wildmode' is used, "wildmenu" mode is used where "full" is
@@ -27731 +29073 @@
         the right and/or a "<" is shown on the left.  The status line scrolls
         as needed.
-@@ -8029,8 +8228,13 @@
+@@ -8029,8 +8270,13 @@
                         {not in Vi}
         Make a backup before overwriting a file.  The backup is removed after
@@ -27749 +29091 @@
 diff -Naur vim73.orig/runtime/doc/os_risc.txt vim73/runtime/doc/os_risc.txt
 --- vim73.orig/runtime/doc/os_risc.txt  2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/os_risc.txt       2013-06-07 17:07:09.345648655 +0000
++++ vim73/runtime/doc/os_risc.txt       2013-08-04 19:09:07.930618585 +0000
 @@ -1,322 +1,12 @@
 -*os_risc.txt*   For Vim version 7.3.  Last change: 2010 Aug 07
@@ -28078 +29420 @@
 diff -Naur vim73.orig/runtime/doc/os_vms.txt vim73/runtime/doc/os_vms.txt
 --- vim73.orig/runtime/doc/os_vms.txt   2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/os_vms.txt        2013-06-07 17:07:09.365648598 +0000
++++ vim73/runtime/doc/os_vms.txt        2013-08-04 19:09:07.933951909 +0000
 @@ -1,4 +1,4 @@
 -*os_vms.txt*    For Vim version 7.3.  Last change: 2010 Jul 28
@@ -28388 +29730 @@
 diff -Naur vim73.orig/runtime/doc/os_win32.txt vim73/runtime/doc/os_win32.txt
 --- vim73.orig/runtime/doc/os_win32.txt 2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/os_win32.txt      2013-06-07 17:07:09.382315217 +0000
++++ vim73/runtime/doc/os_win32.txt      2013-08-04 19:09:07.933951909 +0000
 @@ -1,4 +1,4 @@
 -*os_win32.txt*  For Vim version 7.3.  Last change: 2010 Jul 20
@@ -28435 +29777 @@
 diff -Naur vim73.orig/runtime/doc/pattern.txt vim73/runtime/doc/pattern.txt
 --- vim73.orig/runtime/doc/pattern.txt  2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pattern.txt       2013-06-07 17:07:09.388981864 +0000
++++ vim73/runtime/doc/pattern.txt       2013-08-04 19:09:07.937285232 +0000
 @@ -1,4 +1,4 @@
 -*pattern.txt*   For Vim version 7.3.  Last change: 2010 Jul 20
@@ -28717 +30059 @@
 diff -Naur vim73.orig/runtime/doc/pi_getscript.txt vim73/runtime/doc/pi_getscript.txt
 --- vim73.orig/runtime/doc/pi_getscript.txt     2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pi_getscript.txt  2013-06-07 17:07:09.412315131 +0000
++++ vim73/runtime/doc/pi_getscript.txt  2013-08-04 19:09:07.940618555 +0000
 @@ -1,15 +1,21 @@
 -*pi_getscript.txt*  For Vim version 7.3.  Last change: 2009 Oct 14
@@ -28862 +30204 @@
 diff -Naur vim73.orig/runtime/doc/pi_gzip.txt vim73/runtime/doc/pi_gzip.txt
 --- vim73.orig/runtime/doc/pi_gzip.txt  2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pi_gzip.txt       2013-06-07 17:07:09.418981779 +0000
++++ vim73/runtime/doc/pi_gzip.txt       2013-08-04 19:09:07.940618555 +0000
 @@ -1,4 +1,4 @@
 -*pi_gzip.txt*   For Vim version 7.3.  Last change: 2002 Oct 29
@@ -28880 +30222 @@
 diff -Naur vim73.orig/runtime/doc/pi_netrw.txt vim73/runtime/doc/pi_netrw.txt
 --- vim73.orig/runtime/doc/pi_netrw.txt 2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pi_netrw.txt      2013-06-07 17:07:09.482314931 +0000
++++ vim73/runtime/doc/pi_netrw.txt      2013-08-04 19:09:07.950618525 +0000
 @@ -1,22 +1,21 @@
 -*pi_netrw.txt*  For Vim version 7.3.  Last change: 2010 Jul 28
@@ -31248 +32590 @@
 diff -Naur vim73.orig/runtime/doc/pi_paren.txt vim73/runtime/doc/pi_paren.txt
 --- vim73.orig/runtime/doc/pi_paren.txt 2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pi_paren.txt      2013-06-07 17:07:09.485648255 +0000
++++ vim73/runtime/doc/pi_paren.txt      2013-08-04 19:09:07.950618525 +0000
 @@ -1,4 +1,4 @@
 -*pi_paren.txt*  For Vim version 7.3.  Last change: 2008 Jun 16
@@ -31269 +32611 @@
 diff -Naur vim73.orig/runtime/doc/pi_tar.txt vim73/runtime/doc/pi_tar.txt
 --- vim73.orig/runtime/doc/pi_tar.txt   2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pi_tar.txt        2013-06-07 17:07:09.528981465 +0000
++++ vim73/runtime/doc/pi_tar.txt        2013-08-04 19:09:07.953951848 +0000
 @@ -1,14 +1,21 @@
 -*pi_tar.txt*   For Vim version 7.3.  Last change: 2010 Aug 09
@@ -31335 +32677 @@
 diff -Naur vim73.orig/runtime/doc/pi_vimball.txt vim73/runtime/doc/pi_vimball.txt
 --- vim73.orig/runtime/doc/pi_vimball.txt       2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pi_vimball.txt    2013-06-07 17:07:09.545648084 +0000
++++ vim73/runtime/doc/pi_vimball.txt    2013-08-04 19:09:07.957285172 +0000
 @@ -1,4 +1,4 @@
 -*pi_vimball.txt*       For Vim version 7.3.  Last change: 2010 Apr 12
@@ -31406 +32748 @@
 diff -Naur vim73.orig/runtime/doc/pi_zip.txt vim73/runtime/doc/pi_zip.txt
 --- vim73.orig/runtime/doc/pi_zip.txt   2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/pi_zip.txt        2013-06-07 17:07:09.555648055 +0000
++++ vim73/runtime/doc/pi_zip.txt        2013-08-04 19:09:07.957285172 +0000
 @@ -1,30 +1,31 @@
 -*pi_zip.txt*   For Vim version 7.3.  Last change: 2010 Apr 12
@@ -31494 +32836 @@
 diff -Naur vim73.orig/runtime/doc/quickfix.txt vim73/runtime/doc/quickfix.txt
 --- vim73.orig/runtime/doc/quickfix.txt 2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/quickfix.txt      2013-06-07 17:07:09.592314617 +0000
++++ vim73/runtime/doc/quickfix.txt      2013-08-04 19:09:07.963951818 +0000
 @@ -1,4 +1,4 @@
 -*quickfix.txt*  For Vim version 7.3.  Last change: 2010 Jul 20
@@ -31589 +32931 @@
 diff -Naur vim73.orig/runtime/doc/quickref.txt vim73/runtime/doc/quickref.txt
 --- vim73.orig/runtime/doc/quickref.txt 2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/quickref.txt      2013-06-07 17:07:09.622314532 +0000
++++ vim73/runtime/doc/quickref.txt      2013-08-04 19:09:07.967285142 +0000
 @@ -1,4 +1,4 @@
 -*quickref.txt*  For Vim version 7.3.  Last change: 2010 Jul 24
-+*quickref.txt*  For Vim version 7.3.  Last change: 2013 May 20
++*quickref.txt*  For Vim version 7.3.  Last change: 2013 Jun 29
  
  
@@ -31776 +33118 @@
  'fillchars'      'fcs'     characters to use for displaying special items
  'fkmap'                  'fk'      Farsi keyboard mapping
-@@ -800,7 +802,7 @@
+@@ -736,10 +738,12 @@
+ 'iconstring'               string to use for the Vim icon text
+ 'ignorecase'     'ic'      ignore case in search patterns
+ 'imactivatekey'   'imak'    key that activates the X input method
++'imactivatefunc'  'imaf'    function to enable/disable the X input method
+ 'imcmdline'      'imc'     use IM when starting to edit a command line
+ 'imdisable'      'imd'     do not use the IM in any mode
+ 'iminsert'       'imi'     use :lmap or IM in Insert mode
+ 'imsearch'       'ims'     use :lmap or IM when typing a search pattern
++'imstatusfunc'    'imsf'    function to obtain X input method status
+ 'include'        'inc'     pattern to be used to find an include file
+ 'includeexpr'    'inex'    expression used to process an include line
+ 'incsearch'      'is'      highlight match while typing search pattern
+@@ -800,7 +804,7 @@
  'omnifunc'       'ofu'     function for filetype-specific completion
  'opendevice'     'odev'    allow reading/writing devices on MS-Windows
@@ -31785 +33140 @@
  'paste'                            allow pasting text
  'pastetoggle'    'pt'      key code that causes 'paste' to toggle
-@@ -822,6 +824,7 @@
+@@ -822,6 +826,7 @@
  'quoteescape'    'qe'      escape characters used in a string
  'readonly'       'ro'      disallow writing the buffer
@@ -31793 +33148 @@
  'remap'                            allow mappings to work recursively
  'report'                   threshold for reporting nr. of lines changed
-@@ -850,6 +853,7 @@
+@@ -850,6 +855,7 @@
  'shellslash'     'ssl'     use forward slash for shell file names
  'shelltemp'      'stmp'    whether to use a temp file for shell commands
@@ -31801 +33156 @@
  'shiftround'     'sr'      round indent to multiple of shiftwidth
  'shiftwidth'     'sw'      number of spaces to use for (auto)indent step
-@@ -934,6 +938,7 @@
+@@ -934,6 +940,7 @@
  'wildchar'       'wc'      command-line character for wildcard expansion
  'wildcharm'      'wcm'     like 'wildchar' but also works when mapped
@@ -31809 +33164 @@
  'wildmode'       'wim'     mode for 'wildchar' command-line expansion
  'wildoptions'    'wop'     specifies how command line completion is done
-@@ -955,9 +960,9 @@
+@@ -955,9 +962,9 @@
  ------------------------------------------------------------------------------
  *Q_ur*         Undo/Redo commands
@@ -31821 +33176 @@
  *Q_et*         External commands
  
-@@ -1008,7 +1013,7 @@
+@@ -1008,7 +1015,7 @@
                                    C4350, etc.)
  |:normal|      :norm[al][!] {commands}
@@ -31830 +33185 @@
  |:redir|       :redir >{file}          redirect messages to {file}
  |:silent|      :silent[!] {command}    execute {command} silently
-@@ -1084,18 +1089,18 @@
+@@ -1084,18 +1091,18 @@
  ------------------------------------------------------------------------------
  *Q_ex*         Special Ex characters
@@ -31855 +33210 @@
  |:<cword>|  <cword>    word under the cursor (only where a file name is
                            expected)
-@@ -1168,18 +1173,18 @@
+@@ -1168,18 +1175,18 @@
            Without !: Fail if changes have been made to the current buffer.
               With !: Discard any changes to the current buffer.
@@ -31883 +33238 @@
  ------------------------------------------------------------------------------
  *Q_fl*         Using the argument list                 |argument-list|
-@@ -1195,12 +1200,12 @@
+@@ -1195,12 +1202,12 @@
  
              in current window    in new window ~
@@ -31899 +33254 @@
  *Q_wq*         Writing and quitting
  
-@@ -1377,7 +1382,7 @@
+@@ -1377,7 +1384,7 @@
                 set foldmethod=indent   folding by indent
                 set foldmethod=expr     folding by 'foldexpr'
@@ -31910 +33265 @@
 diff -Naur vim73.orig/runtime/doc/quotes.txt vim73/runtime/doc/quotes.txt
 --- vim73.orig/runtime/doc/quotes.txt   2010-08-15 12:23:21.000000000 +0000
-+++ vim73/runtime/doc/quotes.txt        2013-06-07 17:07:09.642314475 +0000
++++ vim73/runtime/doc/quotes.txt        2013-08-04 19:09:07.970618465 +0000
 @@ -1,4 +1,4 @@
 -*quotes.txt*    For Vim version 7.3.  Last change: 2006 Apr 24
@@ -31946 +33301 @@
 diff -Naur vim73.orig/runtime/doc/repeat.txt vim73/runtime/doc/repeat.txt
 --- vim73.orig/runtime/doc/repeat.txt   2010-08-15 12:23:22.000000000 +0000
-+++ vim73/runtime/doc/repeat.txt        2013-06-07 17:07:09.672314389 +0000
++++ vim73/runtime/doc/repeat.txt        2013-08-04 19:09:07.977285112 +0000
 @@ -1,4 +1,4 @@
 -*repeat.txt*    For Vim version 7.3.  Last change: 2009 Nov 04
@@ -31992 +33347 @@
 diff -Naur vim73.orig/runtime/doc/sign.txt vim73/runtime/doc/sign.txt
 --- vim73.orig/runtime/doc/sign.txt     2010-08-15 12:23:22.000000000 +0000
-+++ vim73/runtime/doc/sign.txt  2013-06-07 17:07:09.742314189 +0000
++++ vim73/runtime/doc/sign.txt  2013-08-04 19:09:07.980618435 +0000
 @@ -1,4 +1,4 @@
 -*sign.txt*      For Vim version 7.3.  Last change: 2010 May 07
@@ -32042 +33397 @@
 diff -Naur vim73.orig/runtime/doc/spell.txt vim73/runtime/doc/spell.txt
 --- vim73.orig/runtime/doc/spell.txt    2010-08-15 12:23:22.000000000 +0000
-+++ vim73/runtime/doc/spell.txt 2013-06-07 17:07:09.755647484 +0000
++++ vim73/runtime/doc/spell.txt 2013-08-04 19:09:07.987285082 +0000
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.3.  Last change: 2010 Apr 11
-+*spell.txt*    For Vim version 7.3.  Last change: 2011 May 25
++*spell.txt*    For Vim version 7.3.  Last change: 2013 Jun 26
  
  
@@ -32068 +33423 @@
                         the optimal word tree (Polish, Italian and Hungarian
                         require several hundred Mbyte).  The final result will
-@@ -1241,6 +1244,7 @@
+@@ -925,9 +928,13 @@
+ Vim allows you to use spell checking for several languages in the same file.
+ You can list them in the 'spelllang' option.  As a consequence all spell files
+ for the same encoding must use the same word characters, otherwise they can't
+-be combined without errors.  If you get a warning that the word tables differ
+-you may need to generate the .spl file again with |:mkspell|.  Check the FOL,
+-LOW and UPP lines in the used .aff file.
++be combined without errors.
++
++If you get an E763 warning that the word tables differ you need to update your
++".spl" spell files.  If you downloaded the files, get the latest version of
++all spell files you use.  Otherwise generate the .spl file again with
++|:mkspell|.  If you still get errors check the FOL, LOW and UPP lines in the
++used .aff files.
+ 
+ The XX.ascii.spl spell file generated with the "-ascii" argument will not
+ contain the table with characters, so that it can be combine with spell files
+@@ -1241,6 +1248,7 @@
  Optionally this may be followed by:
         *       the group appears zero or more times, e.g., sm*e
@@ -32076 +33448 @@
  This is similar to the regexp pattern syntax (but not the same!).  A few
  examples with the sequence of word flags they require:
-@@ -1248,6 +1252,7 @@
+@@ -1248,6 +1256,7 @@
      COMPOUNDRULE yz        yz
      COMPOUNDRULE x+z       xz xxz xxxz etc.
@@ -32086 +33458 @@
 diff -Naur vim73.orig/runtime/doc/starting.txt vim73/runtime/doc/starting.txt
 --- vim73.orig/runtime/doc/starting.txt 2010-08-15 12:23:22.000000000 +0000
-+++ vim73/runtime/doc/starting.txt      2013-06-07 17:07:09.798980694 +0000
++++ vim73/runtime/doc/starting.txt      2013-08-04 19:09:07.990618405 +0000
 @@ -1,4 +1,4 @@
 -*starting.txt*  For Vim version 7.3.  Last change: 2009 Dec 31
-+*starting.txt*  For Vim version 7.3.  Last change: 2013 May 29
++*starting.txt*  For Vim version 7.3.  Last change: 2013 Jun 12
  
  
@@ -32162 +33534 @@
  --nofork       GUI: Do not fork.  Same as |-f|.
                                                         *-u* *E282*
-@@ -869,6 +875,7 @@
+@@ -751,11 +757,21 @@
+        file, but "exrc" is what Vi always used, "vimrc" is a Vim specific
+        name.  Also see |vimrc-intro|.
+ 
+-       Recommended place for your personal initializations:
+-               Unix                $HOME/.vimrc
+-               OS/2                $HOME/.vimrc or $VIM/.vimrc (or _vimrc)
+-               MS-DOS and Win32    $HOME/_vimrc or $VIM/_vimrc
+-               Amiga               s:.vimrc or $VIM/.vimrc
++       Places for your personal initializations:
++               Unix            $HOME/.vimrc or $HOME/.vim/vimrc
++               OS/2            $HOME/.vimrc, $HOME/vimfiles/vimrc
++                               or $VIM/.vimrc (or _vimrc)
++               MS-Windows      $HOME/_vimrc, $HOME/vimfiles/vimrc
++                               or $VIM/_vimrc
++               Amiga           s:.vimrc, home:.vimrc, home:vimfiles:vimrc
++                               or $VIM/.vimrc
++
++       The files are searched in the order specified above and only the first
++       one that is found is read.
++
++       RECOMMENDATION: Put all your Vim configuration stuff in the
++       $HOME/.vim/ directory ($HOME/vimfiles/ for MS-Windows). That makes it
++       easy to copy it to another system.
+ 
+        If Vim was started with "-u filename", the file "filename" is used.
+        All following initializations until 4. are skipped.
+@@ -785,12 +801,15 @@
+        -  The environment variable VIMINIT (see also |compatible-default|) (*)
+           The value of $VIMINIT is used as an Ex command line.
+        -  The user vimrc file(s):
+-                   "$HOME/.vimrc"      (for Unix and OS/2) (*)
+-                   "s:.vimrc"          (for Amiga) (*)
+-                   "home:.vimrc"       (for Amiga) (*)
+-                   "$VIM/.vimrc"       (for OS/2 and Amiga) (*)
+-                   "$HOME/_vimrc"      (for MS-DOS and Win32) (*)
+-                   "$VIM/_vimrc"       (for MS-DOS and Win32) (*)
++                   "$HOME/.vimrc"         (for Unix and OS/2) (*)
++                   "$HOME/.vim/vimrc"     (for Unix and OS/2) (*)
++                   "s:.vimrc"             (for Amiga) (*)
++                   "home:.vimrc"          (for Amiga) (*)
++                   "home:vimfiles:vimrc"  (for Amiga) (*)
++                   "$VIM/.vimrc"          (for OS/2 and Amiga) (*)
++                   "$HOME/_vimrc"         (for MS-DOS and Win32) (*)
++                   "$HOME/vimfiles/vimrc" (for MS-DOS and Win32) (*)
++                   "$VIM/_vimrc"          (for MS-DOS and Win32) (*)
+                Note: For Unix, OS/2 and Amiga, when ".vimrc" does not exist,
+                "_vimrc" is also tried, in case an MS-DOS compatible file
+                system is used.  For MS-DOS and Win32 ".vimrc" is checked
+@@ -869,6 +888,7 @@
  12. Execute startup commands
         If a "-t" flag was given to Vim, the tag is jumped to.
@@ -32172 +33593 @@
 diff -Naur vim73.orig/runtime/doc/syntax.txt vim73/runtime/doc/syntax.txt
 --- vim73.orig/runtime/doc/syntax.txt   2010-08-15 12:23:22.000000000 +0000
-+++ vim73/runtime/doc/syntax.txt        2013-06-07 17:07:09.818980637 +0000
++++ vim73/runtime/doc/syntax.txt        2013-08-04 19:09:08.000618375 +0000
 @@ -1,4 +1,4 @@
 -*syntax.txt*   For Vim version 7.3.  Last change: 2010 Aug 10
-+*syntax.txt*   For Vim version 7.3.  Last change: 2013 Jun 06
++*syntax.txt*   For Vim version 7.3.  Last change: 2013 Jul 05
  
  
@@ -32197 +33618 @@
  
  NAMING CONVENTIONS                 *group-name* *{group-name}* *E669* *W18*
-@@ -379,140 +381,342 @@
+@@ -377,142 +379,379 @@
+ 2HTML                                          *2html.vim* *convert-to-HTML*
+ 
  This is not a syntax file itself, but a script that converts the current
- window into HTML.  Vim opens a new window in which it builds the HTML file.
- 
-+After you save the resulting file, you can view it with any browser.  The
-+colors should be exactly the same as you see them in Vim.  You can jump to
-+specific lines by adding (for example) #L123 or #123 to the end of the URL in
-+your browser's address bar (#123 only with javascript support). And with
+-window into HTML.  Vim opens a new window in which it builds the HTML file.
++window into HTML. Vim opens a new window in which it builds the HTML file.
++
++After you save the resulting file, you can view it with any browser. The
++colors should be exactly the same as you see them in Vim.  With
++|g:html_line_ids| you can jump to specific lines by adding (for example) #L123
++or #123 to the end of the URL in your browser's address bar. And with
 +|g:html_dynamic_folds| enabled, you can show or hide the text that is folded
 +in Vim.
-+
+ 
  You are not supposed to set the 'filetype' or 'syntax' option to "2html"!
  Source the script to convert the current file: >
@@ -32268 +33692 @@
 +                       respectively. Default range is the entire buffer.
 +
-+                       If the current window is part of a |diff|, unless
-+                       |g:html_diff_one_file| is set, :TOhtml will convert
-+                       all windows which are part of the diff in the current
-+                       tab and place them side-by-side in a <table> element
-+                       in the generated HTML. When this happens you can jump
-+                       to lines in specific windows with (for example) #W1L42
-+                       for line 42 in the first diffed window, or #W3L87 for
-+                       line 87 in the third. Omitting the window ID will
-+                       default to the first window if javascript is enabled.
++                        If the current window is part of a |diff|, unless
++                        |g:html_diff_one_file| is set, :TOhtml will convert
++                        all windows which are part of the diff in the current
++                        tab and place them side-by-side in a <table> element
++                        in the generated HTML. With |g:html_line_ids| you can
++                        jump to lines in specific windows with (for example)
++                        #W1L42 for line 42 in the first diffed window, or
++                        #W3L87 for line 87 in the third.
 +
 +                       Examples: >
@@ -32286 +33709 @@
 +                                                       *g:html_diff_one_file*
 +Default: 0.
-+When 0, all windows involved in a |diff| in the current tab page are converted
-+to HTML and placed side-by-side in a <table> element.
-+When 1, only the current buffer is converted.
++When 0, and using |:TOhtml| all windows involved in a |diff| in the current tab
++page are converted to HTML and placed side-by-side in a <table> element. When
++1, only the current buffer is converted.
 +Example: >
 +
@@ -32345 +33768 @@
 -If you need to generate markup for really old browsers or some other user
 -agent that lacks basic CSS support, use: >
++<
++                                                             *g:html_line_ids*
++Default: 1 if |g:html_number_lines| is set, 0 otherwise.
++When 1, adds an HTML id attribute to each line number, or to an empty <span>
++inserted for that purpose if no line numbers are shown. This ID attribute
++takes the form of L123 for single-buffer HTML pages, or W2L123 for diff-view
++pages, and is used to jump to a specific line (in a specific window of a diff
++view). Javascript is inserted to open any closed dynamic folds
++(|g:html_dynamic_folds|) containing the specificed line before jumping. The
++javascript also allows omitting the window ID in the url, and the leading L.
++For example: >
++
++       page.html#L123  jumps to line 123 in a single-buffer file
++       page.html#123   does the same
++
++       diff.html#W1L42 jumps to line 42 in the first window in a diff
++       diff.html#42    does the same
 +<
 +                                                             *g:html_use_css*
@@ -32491 +33931 @@
 -risk of making some things look a bit different, use: >
 +<
++                                                             *g:html_id_expr*
++Default: ""
++Dynamic folding and jumping to line IDs rely on unique IDs within the document
++to work. If generated HTML is copied into a larger document, these IDs are no
++longer guaranteed to be unique. Set g:html_id_expr to an expression Vim can
++evaluate to get a unique string to append to each ID used in a given document,
++so that the full IDs will be unique even when combined with other content in a
++larger HTML document. Example, to append _ and the buffer number to each ID: >
++
++       :let g:html_id_expr = '"_".bufnr("%")'
++<
++To append a string "_mystring" to the end of each ID: >
++
++       :let g:html_id_expr = '"_mystring"'
++<
++Note, when converting a diff view to HTML, the expression will only be
++evaluated for the first window in the diff, and the result used for all the
++windows.
++
 +                                         *TOhtml-wrap-text* *g:html_pre_wrap*
 +Default: current 'wrap' setting.
@@ -32644 +34103 @@
  
  ABEL                                           *abel.vim* *ft-abel-syntax*
-@@ -589,7 +793,11 @@
+@@ -589,7 +828,11 @@
         asmsyntax=nasm
  Replace "nasm" with the name of the real assembly syntax.  This line must be
@@ -32657 +34116 @@
  The syntax type can always be overruled for a specific buffer by setting the
  b:asmsyntax variable: >
-@@ -694,10 +902,12 @@
+@@ -694,10 +937,12 @@
  c_ansi_typedefs                 ... but do standard ANSI types
  c_ansi_constants        ... but do standard ANSI constants
@@ -32671 +34130 @@
  When 'foldmethod' is set to "syntax" then /* */ comments and { } blocks will
  become a fold.  If you don't want comments to become a fold use: >
-@@ -798,6 +1008,14 @@
+@@ -798,6 +1043,14 @@
  The ColdFusion syntax file is based on the HTML syntax file.
  
@@ -32686 +34145 @@
  
  This covers the shell named "csh".  Note that on some systems tcsh is actually
-@@ -806,13 +1024,13 @@
+@@ -806,13 +1059,13 @@
  Detecting whether a file is csh or tcsh is notoriously hard.  Some systems
  symlink /bin/csh to /bin/tcsh, making it almost impossible to distinguish
@@ -32704 +34163 @@
  Any script with a tcsh extension or a standard tcsh filename (.tcshrc,
  tcsh.tcshrc, tcsh.login) will have filetype tcsh.  All other tcsh/csh scripts
-@@ -872,8 +1090,8 @@
+@@ -872,8 +1125,8 @@
  
  
@@ -32715 +34174 @@
  There are two types of DocBook files: SGML and XML.  To specify what type you
  are using the "b:docbk_type" variable should be set.  Vim does this for you
-@@ -889,6 +1107,10 @@
+@@ -889,6 +1142,10 @@
  or: >
         :set filetype=docbkxml
@@ -32726 +34185 @@
  DOSBATCH                               *dosbatch.vim* *ft-dosbatch-syntax*
  
-@@ -925,9 +1147,9 @@
+@@ -925,9 +1182,9 @@
  or >
         // vim:syntax=c.doxygen
@@ -32739 +34198 @@
  
  There are a couple of variables that have an effect on syntax highlighting, and
-@@ -1026,22 +1248,24 @@
+@@ -1026,22 +1283,24 @@
  
  ERLANG                                         *erlang.vim* *ft-erlang-syntax*
@@ -32774 +34233 @@
  Syntax highlighting is available for the most common elements of FlexWiki
  syntax. The associated ftplugin script sets some buffer-local options to make
-@@ -1093,14 +1317,12 @@
+@@ -1093,14 +1352,12 @@
  FORTRAN                                        *fortran.vim* *ft-fortran-syntax*
  
@@ -32784 +34243 @@
 -automatically available in the default (f95) highlighting.
 +Highlighting appropriate for Fortran 2008 is used by default.  This choice
-+should be appropriate for most users most of the time because Fortran 2008 is 
-+almost a superset of previous versions (Fortran 2003, 95, 90, and 77). 
++should be appropriate for most users most of the time because Fortran 2008 is
++almost a superset of previous versions (Fortran 2003, 95, 90, and 77).
  
  Fortran source code form ~
@@ -32793 +34252 @@
  
  When you create a new fortran file, the syntax script assumes fixed source
-@@ -1181,52 +1403,54 @@
+@@ -1181,52 +1438,54 @@
  construct.
  
@@ -32832 +34291 @@
 +If you use F, the advantage of setting the dialect appropriately is that
 +other legacy features excluded from F will be highlighted as todo items and
-+that free source form will be assumed. 
++that free source form will be assumed.
 +
 +The dialect can be selected in various ways.  If all your fortran files use
@@ -32875 +34334 @@
 +now-obsolete values "f77", "f90", "f95", or "elf". Such settings will be
 +silently handled as "f08". Users of "elf" may wish to experiment with "F"
-+instead. 
++instead.
 +
 +The syntax/fortran.vim script contains embedded comments that tell you how to
@@ -32881 +34340 @@
 +non-standard, vendor-supplied intrinsics and (b) to prevent features deleted
 +or declared obsolescent in the 2008 standard from being highlighted as todo
-+items. 
++items.
  
  Limitations ~
  Parenthesis checking does not catch too few closing parentheses.  Hollerith
-@@ -1541,11 +1765,6 @@
+@@ -1541,11 +1800,6 @@
  strings, strings, boolean constants and types (this, super) respectively.  I
  have opted to chose another background for those statements.
@@ -32897 +34356 @@
  creates HTML pages.  The standard configuration will highlight this HTML code
  similarly to HTML files (see |html.vim|).  You can even add Javascript
-@@ -1684,19 +1903,10 @@
+@@ -1684,19 +1938,10 @@
  
  LUA                                            *lua.vim* *ft-lua-syntax*
@@ -32919 +34378 @@
         :let lua_version = 5
         :let lua_subversion = 1
-@@ -1868,7 +2078,7 @@
+@@ -1868,7 +2113,7 @@
  than you intend to have in your final document.  For this reason, the common
  practice is to insert a carriage return immediately after all punctuation
@@ -32928 +34387 @@
  
    :let nroff_space_errors = 1
-@@ -2085,7 +2295,7 @@
+@@ -1987,9 +2232,11 @@
+ 
+ There are a number of possible options to the perl syntax highlighting.
+ 
+-If you use POD files or POD segments, you might: >
++Inline POD highlighting is now turned on by default.  If you don't wish
++to have the added complexity of highlighting POD embedded within Perl
++files, you may set the 'perl_include_pod' option to 0: >
+ 
+-       :let perl_include_pod = 1
++       :let perl_include_pod = 0
+ 
+ The reduce the complexity of parsing (and increase performance) you can switch
+ off two elements in the parsing of variable names and contents. >
+@@ -2042,13 +2289,20 @@
+ 
+        :let perl_fold_blocks = 1
+ 
+-To avoid folding packages or subs when perl_fold is let, let the appropriate
+-variable(s): >
++Subroutines are folded by default if 'perl_fold' is set.  If you do not want
++this, you can set 'perl_nofold_subs': >
++
++       :let perl_nofold_subs = 1
+ 
+-       :unlet perl_nofold_packages
+-       :unlet perl_nofold_subs
++Anonymous subroutines are not folded by default; you may enable their folding
++via 'perl_fold_anonymous_subs': >
+ 
++       :let perl_fold_anonymous_subs = 1
+ 
++Packages are also folded by default if 'perl_fold' is set.  To disable this
++behavior, set 'perl_nofold_packages': >
++
++       :let perl_nofold_packages = 1
+ 
+ PHP3 and PHP4          *php.vim* *php3.vim* *ft-php-syntax* *ft-php3-syntax*
+ 
+@@ -2085,7 +2339,7 @@
  
    let php_parent_error_close = 1
@@ -32937 +34435 @@
  
    let php_parent_error_open = 1
-@@ -2247,24 +2457,33 @@
+@@ -2247,24 +2501,33 @@
  
  PYTHON                                         *python.vim* *ft-python-syntax*
@@ -32955 +34453 @@
 -       :let python_highlight_exceptions = 1
 +       :let python_no_exception_highlight = 1
- 
--For highlighted trailing whitespace and mix of spaces and tabs:
--       :let python_highlight_space_errors = 1
++
 +For highlighted doctests and code inside: >
 +       :let python_no_doctest_highlight = 1
@@ -32963 +34459 @@
 +       :let python_no_doctest_code_highlight = 1
 +(first option implies second one).
-+
+ 
+-For highlighted trailing whitespace and mix of spaces and tabs:
+-       :let python_highlight_space_errors = 1
 +For highlighted trailing whitespace and mix of spaces and tabs: >
 +       :let python_space_error_highlight = 1
@@ -32972 +34470 @@
         :let python_highlight_all = 1
  
-+Note: only existence of these options matter, not their value. You can replace 
++Note: only existence of these options matter, not their value. You can replace
 +      1 above with anything.
 +
@@ -32978 +34476 @@
  QUAKE                                          *quake.vim* *ft-quake-syntax*
  
-@@ -2300,6 +2519,12 @@
+@@ -2300,6 +2563,12 @@
  later, and part earlier) adds.
  
@@ -32991 +34489 @@
  
  If you notice highlighting errors while scrolling backwards, which are fixed
-@@ -2310,6 +2535,12 @@
+@@ -2310,6 +2579,12 @@
  displayed line.  The default value is 10.  The disadvantage of using a larger
  number is that redrawing can become slow.
@@ -33004 +34502 @@
  RUBY                                           *ruby.vim* *ft-ruby-syntax*
  
-@@ -2537,8 +2768,41 @@
+@@ -2537,8 +2812,41 @@
  The default is to use the twice sh_minlines.  Set it to a smaller number to
  speed up displaying.  The disadvantage is that highlight errors may appear.
@@ -33039 +34537 @@
 +be highlighted using the awk highlighting syntax.  Clearly this may be
 +extended to other languages.
++
  
 -SPEEDUP (AspenTech plant simulator)            *spup.vim* *ft-spup-syntax*
-+
 +SPEEDUP                                                *spup.vim* *ft-spup-syntax*
 +(AspenTech plant simulator)
@@ -33047 +34545 @@
  The Speedup syntax file has some options:
  
-@@ -2621,6 +2885,8 @@
+@@ -2610,9 +2918,24 @@
+ redrawing can become slow.
+ 
+ 
+-TEX                                            *tex.vim* *ft-tex-syntax*
++TEX                            *tex.vim* *ft-tex-syntax* *latex-syntax*
++
++                       Tex Contents~
++       Tex: Want Syntax Folding?                       |tex-folding|
++       Tex: No Spell Checking Wanted                   |g:tex_nospell|
++       Tex: Don't Want Spell Checking In Comments?     |tex-nospell|
++       Tex: Want Spell Checking in Verbatim Zones?     |tex-verb|
++       Tex: Run-on Comments or MathZones               |tex-runon|
++       Tex: Slow Syntax Highlighting?                  |tex-slow|
++       Tex: Want To Highlight More Commands?           |tex-morecommands|
++       Tex: Excessive Error Highlighting?              |tex-error|
++       Tex: Need a new Math Group?                     |tex-math|
++       Tex: Starting a New Style?                      |tex-style|
++       Tex: Taking Advantage of Conceal Mode           |tex-conceal|
++       Tex: Selective Conceal Mode                     |g:tex_conceal|
++       Tex: Controlling iskeyword                      |g:tex_isk|
+ 
+-                                                               *tex-folding*
++                               *tex-folding* *g:tex_fold_enabled*
+  Tex: Want Syntax Folding? ~
+ 
+ As of version 28 of <syntax/tex.vim>, syntax-based folding of parts, chapters,
+@@ -2621,16 +2944,28 @@
  in your <.vimrc>, and :set fdm=syntax.  I suggest doing the latter via a
  modeline at the end of your LaTeX file: >
         % vim: fdm=syntax
 +If your system becomes too slow, then you might wish to look into >
-+       http://vim.wikia.com/wiki/Keep_folds_closed_while_inserting_text
++       https://vimhelp.appspot.com/vim_faq.txt.html#faq-29.7
  <
-                                                                *tex-nospell*
+-                                                               *tex-nospell*
++                                               *g:tex_nospell*
++ Tex: No Spell Checking Wanted~
++
++If you don't want spell checking anywhere in your LaTeX document, put >
++       let g:tex_nospell=1
++into your .vimrc.  If you merely wish to suppress spell checking inside
++comments only, see |g:tex_comment_nospell|.
++
++                               *tex-nospell* *g:tex_comment_nospell*
   Tex: Don't Want Spell Checking In Comments? ~
-@@ -2629,7 +2895,14 @@
+ 
+ Some folks like to include things like source code in comments and so would
  prefer that spell checking be disabled in comments in LaTeX files.  To do
  this, put the following in your <.vimrc>: >
        let g:tex_comment_nospell= 1
 -<
-+The comment lines >
-+       % nospell{
-+       ...
-+       % nospell}
-+will suppress spell checking between them.  These comment lines spelling
-+control are known to be fragile; for example, don't include any of the section
-+commands (\part, \chapter, \section, \paragraph, etc) inside nospell blocks
-+or interleave environments (such as math) across nospell blocks.
-                                                                *tex-verb*
+-                                                               *tex-verb*
++If you want to suppress spell checking everywhere inside your LaTeX document,
++see |g:tex_nospell|.
++
++                               *tex-verb* *g:tex_verbspell*
   Tex: Want Spell Checking in Verbatim Zones?~
  
-@@ -2661,6 +2934,38 @@
+ Often verbatim regions are used for things like source code; seldom does
+@@ -2638,7 +2973,7 @@
+ want your verbatim zones spell-checked, put the following in your <.vimrc>: >
+        let g:tex_verbspell= 1
+ <
+-                                                               *tex-runon*
++                                       *tex-runon* *tex-stopzone*
+  Tex: Run-on Comments or MathZones ~
+ 
+ The <syntax/tex.vim> highlighting supports TeX, LaTeX, and some AmsTeX.  The
+@@ -2651,7 +2986,7 @@
+ which will forcibly terminate the highlighting of either a texZone or a
+ texMathZone.
+ 
+-                                                               *tex-slow*
++                                       *tex-slow* *tex-sync*
+  Tex: Slow Syntax Highlighting? ~
+ 
+ If you have a slow computer, you may wish to reduce the values for >
+@@ -2661,7 +2996,39 @@
  increase them. This primarily affects synchronizing (i.e. just what group,
  if any, is the text at the top of the screen supposed to be in?).
  
+-                                           *tex-morecommands* *tex-package*
 +Another cause of slow highlighting is due to syntax-driven folding; see
 +|tex-folding| for a way around this.
 +
-+                                                               *g:tex_fast*
++                                       *g:tex_fast*
 +
 +Finally, if syntax highlighting is still too slow, you may set >
@@ -33108 +34659 @@
 +but suppress all the other region-based syntax highlighting.
 +
-                                            *tex-morecommands* *tex-package*
++                                       *tex-morecommands* *tex-package*
   Tex: Want To Highlight More Commands? ~
  
-@@ -2669,7 +2974,9 @@
+ LaTeX is a programmable language, and so there are thousands of packages full
+@@ -2669,16 +3036,18 @@
  package you'll often wish that the distributed syntax/tex.vim would support
  it.  However, clearly this is impractical.  So please consider using the
@@ -33120 +34672 @@
 +http://vim.sf.net/.
  
-                                                                *tex-error*
+-                                                               *tex-error*
++                                       *tex-error* *g:tex_no_error*
   Tex: Excessive Error Highlighting? ~
-@@ -2731,6 +3038,7 @@
- following sets of characters: >
+ 
+ The <tex.vim> supports lexical error checking of various sorts.  Thus,
+ although the error checking is ofttimes very useful, it can indicate
+ errors where none actually are.  If this proves to be a problem for you,
+ you may put in your <.vimrc> the following statement: >
+-       let tex_no_error=1
++       let g:tex_no_error=1
+ and all error checking by <syntax/tex.vim> will be suppressed.
+ 
+                                                                *tex-math*
+@@ -2696,7 +3065,7 @@
+ The "starform" variable, if true, implies that your new math group
+ has a starred form (ie. eqnarray*).
+ 
+-                                                               *tex-style*
++                                       *tex-style* *b:tex_stylish*
+  Tex: Starting a New Style? ~
+ 
+ One may use "\makeatletter" in *.tex files, thereby making the use of "@" in
+@@ -2723,14 +3092,15 @@
+ One way to use this is to have vertically split windows (see |CTRL-W_v|); one
+ with |'conceallevel'| at 0 and the other at 2; and both using |'scrollbind'|.
+ 
+-                                                       *g:tex_conceal*
++                                       *g:tex_conceal*
+  Tex: Selective Conceal Mode~
+ 
+ You may selectively use conceal mode by setting g:tex_conceal in your
+-<.vimrc>.  By default it is set to "admgs" to enable conceal for the
+-following sets of characters: >
++<.vimrc>.  By default, g:tex_conceal is set to "admgs" to enable concealment
++for the following sets of characters: >
  
         a = accents/ligatures
@@ -33130 +34713 @@
         m = math symbols
         g = Greek
-@@ -2739,6 +3047,18 @@
+@@ -2739,6 +3109,25 @@
  By leaving one or more of these out, the associated conceal-character
  substitution will not be made.
  
-+                                               *g:tex_isk*
-+ Tex: Controlling What's In A Keyword~
-+
-+(La)Tex keywords normally use the characters 0-9,a-z,A-Z,192-255 only
-+but the "_" is the only one that causes problems.  So, by default,
-+syntax/tex.vim overrides the usual |'iskeyword'| setting (using |:setlocal|)
-+with one that works for LaTeX.
-+
-+However, one may override this iskeyword re-setting by setting the
-+variable, g:tex_isk, in one's .vimrc to whatever one wishes and
-+it will be used instead.
-+ 
++                                               *g:tex_isk* *g:tex_stylish*
++ Tex: Controlling iskeyword~
++
++Normally, LaTeX keywords support 0-9, a-z, A-z, and 192-255 only. Latex
++keywords don't support the underscore - except when in *.sty files.  The
++syntax highlighting script handles this with the following logic:
++
++       * If g:tex_stylish exists and is 1
++               then the file will be treated as a "sty" file, so the "_"
++               will be allowed as part of keywords
++               (irregardless of g:tex_isk)
++       * Else if the file's suffix is sty, cls, clo, dtx, or ltx,
++               then the file will be treated as a "sty" file, so the "_"
++               will be allowed as part of keywords
++               (irregardless of g:tex_isk)
++
++       * If g:tex_isk exists, then it will be used for the local 'iskeyword'
++       * Else the local 'iskeyword' will be set to 48-57,a-z,A-Z,192-255
++
  
  TF                                             *tf.vim* *ft-tf-syntax*
  
-@@ -2792,7 +3112,7 @@
+@@ -2748,8 +3137,7 @@
+ set "tf_minlines" to the value you desire.  Example: >
+ 
+        :let tf_minlines = your choice
+-
+-
++<
+ VIM                    *vim.vim*               *ft-vim-syntax*
+                        *g:vimsyn_minlines*     *g:vimsyn_maxlines*
+ There is a trade-off between more accurate syntax highlighting versus screen
+@@ -2792,7 +3180,7 @@
     g:vimsyn_folding =~ 'P' : fold python   script
     g:vimsyn_folding =~ 'r' : fold ruby     script
@@ -33158 +34758 @@
  Not all error highlighting that syntax/vim.vim does may be correct; VimL is a
  difficult language to highlight correctly.  A way to suppress error
-@@ -3174,6 +3494,9 @@
+@@ -3174,6 +3562,9 @@
     :hi par1 ctermfg=red guifg=red
     :hi par2 ctermfg=blue guifg=blue
@@ -33168 +34768 @@
  ==============================================================================
  6. :syntax arguments                                   *:syn-arguments*
-@@ -3218,11 +3541,12 @@
+@@ -3218,11 +3609,12 @@
  in this way when they have their own highlighting via "matchgroup"
  
@@ -33183 +34783 @@
  See |hl-Conceal| for highlighting.
  
-@@ -3536,7 +3860,7 @@
+@@ -3536,7 +3928,7 @@
  e      end of the matched pattern
  e+{nr} end of the matched pattern plus {nr} chars to the right
@@ -33192 +34792 @@
  Examples: "ms=s+1", "hs=e-2", "lc=3".
  
-@@ -3633,10 +3957,10 @@
+@@ -3633,10 +4025,10 @@
  
  These extra regular expression items are available in region patterns:
@@ -33207 +34807 @@
                                         */\z1* */\z2* */\z3* */\z4* */\z5*
      \z1  ...  \z9                      */\z6* */\z7* */\z8* */\z9* *E66* *E67*
-@@ -3711,6 +4035,9 @@
+@@ -3711,6 +4103,9 @@
     :syntax match Stuff "( aaa bbb )" contains=@BigGroup
     :syntax cluster BigGroup remove=B   " no effect, since B isn't in BigGroup
@@ -33217 +34817 @@
  ==============================================================================
  9. Including syntax files                              *:syn-include* *E397*
-@@ -3750,6 +4077,9 @@
+@@ -3750,6 +4145,9 @@
           with his own version, without replacing the file that does the ":syn
           include".
@@ -33227 +34827 @@
  10. Synchronizing                              *:syn-sync* *E403* *E404*
  
-@@ -3803,7 +4133,7 @@
+@@ -3803,7 +4201,7 @@
  The file will be parsed from the start.  This makes syntax highlighting
  accurate, but can be slow for long files.  Vim caches previously parsed text,
@@ -33236 +34836 @@
  
  Using "fromstart" is equivalent to using "minlines" with a very large number.
-@@ -3953,7 +4283,7 @@
+@@ -3953,7 +4351,7 @@
  
      :sy[ntax] list {group-name}
@@ -33245 +34845 @@
      :sy[ntax] list @{cluster-name}
  
-@@ -4316,6 +4646,9 @@
+@@ -3986,7 +4384,7 @@
+                        feature it will output "unknown".
+ 
+ :colo[rscheme] {name}  Load color scheme {name}.  This searches 'runtimepath'
+-                       for the file "colors/{name}.vim.  The first one that
++                       for the file "colors/{name}.vim".  The first one that
+                        is found is loaded.
+                        To see the name of the currently active color scheme: >
+                                :colo
+@@ -4316,6 +4714,9 @@
                                                         *hl-LineNr*
  LineNr         Line number for ":number" and ":#" commands, and when 'number'
@@ -33255 +34864 @@
  MatchParen     The character under the cursor or just before it, if it
                 is a paired bracket, and its match. |pi_paren.txt|
-@@ -4604,7 +4937,7 @@
+@@ -4603,8 +5004,8 @@
+ "w:current_syntax".
  
  Once a window has its own syntax, syntax commands executed from other windows
- on the same buffer (including :syntax clear) have no effect. Conversely, 
+-on the same buffer (including :syntax clear) have no effect. Conversely, 
 -syntax commands executed from that window do not effect other windows on the
++on the same buffer (including :syntax clear) have no effect. Conversely,
 +syntax commands executed from that window do not affect other windows on the
  same buffer.
  
  A window with its own syntax reverts to normal behavior when another buffer
-@@ -4612,7 +4945,7 @@
+@@ -4612,7 +5013,7 @@
  When splitting the window, the new window will use the original syntax.
  
@@ -33273 +34884 @@
  Most color xterms have only eight colors.  If you don't get colors with the
  default setup, it should work with these lines in your .vimrc: >
-@@ -4754,4 +5087,63 @@
+@@ -4754,4 +5155,63 @@
  that Setup / Font / Enable Bold is NOT enabled.
  (info provided by John Love-Jensen <eljay@Adobe.COM>)
@@ -33331 +34942 @@
 +literal text specify the size of that text (in bytes):
 +
-+"<\@<=span"    Matches "span" in "<span".  This tries matching with "<" in
++"<\@<=span"    Matches "span" in "<span".  This tries matching with "<" in
 +               many places.
-+"<\@1<=span"   Matches the same, but only tries one byte before "span".
++"<\@1<=span"   Matches the same, but only tries one byte before "span".
 +
 +
@@ -33339 +34950 @@
 diff -Naur vim73.orig/runtime/doc/tabpage.txt vim73/runtime/doc/tabpage.txt
 --- vim73.orig/runtime/doc/tabpage.txt  2010-08-15 12:23:22.000000000 +0000
-+++ vim73/runtime/doc/tabpage.txt       2013-06-07 17:07:09.825647285 +0000
++++ vim73/runtime/doc/tabpage.txt       2013-08-04 19:09:08.003951698 +0000
 @@ -1,4 +1,4 @@
 -*tabpage.txt*   For Vim version 7.3.  Last change: 2010 Jul 31
@@ -33378 +34989 @@
 diff -Naur vim73.orig/runtime/doc/tags vim73/runtime/doc/tags
 --- vim73.orig/runtime/doc/tags 2010-08-15 12:54:29.000000000 +0000
-+++ vim73/runtime/doc/tags      2013-06-07 17:07:09.852313875 +0000
++++ vim73/runtime/doc/tags      2013-08-04 19:09:08.013951668 +0000
 @@ -154,12 +154,14 @@
  'cscopepathcomp'       options.txt     /*'cscopepathcomp'*
@@ -33415 +35026 @@
  'go-T' options.txt     /*'go-T'*
  'go-a' options.txt     /*'go-a'*
-@@ -520,6 +525,8 @@
+@@ -336,7 +341,9 @@
+ 'iconstring'   options.txt     /*'iconstring'*
+ 'ignorecase'   options.txt     /*'ignorecase'*
+ 'im'   options.txt     /*'im'*
++'imactivatefunc'       options.txt     /*'imactivatefunc'*
+ 'imactivatekey'        options.txt     /*'imactivatekey'*
++'imaf' options.txt     /*'imaf'*
+ 'imak' options.txt     /*'imak'*
+ 'imc'  options.txt     /*'imc'*
+ 'imcmdline'    options.txt     /*'imcmdline'*
+@@ -346,6 +353,8 @@
+ 'iminsert'     options.txt     /*'iminsert'*
+ 'ims'  options.txt     /*'ims'*
+ 'imsearch'     options.txt     /*'imsearch'*
++'imsf' options.txt     /*'imsf'*
++'imstatusfunc' options.txt     /*'imstatusfunc'*
+ 'inc'  options.txt     /*'inc'*
+ 'include'      options.txt     /*'include'*
+ 'includeexpr'  options.txt     /*'includeexpr'*
+@@ -491,8 +500,10 @@
+ 'nocopyindent' options.txt     /*'nocopyindent'*
+ 'nocp' options.txt     /*'nocp'*
+ 'nocrb'        options.txt     /*'nocrb'*
++'nocscoperelative'     options.txt     /*'nocscoperelative'*
+ 'nocscopetag'  options.txt     /*'nocscopetag'*
+