Merge branch 'vim'

Conflicts:
	src/option.c

Author: b4winckler

.hgignore

@@ -64,11 +64,12 @@ src/xxd/xxd.dSYM
 src/po/vim.pot
 
 # Generated by "make test"
-src/po/*.ck 
-src/testdir/mbyte.vim 
-src/testdir/mzscheme.vim 
-src/testdir/lua.vim 
-src/testdir/small.vim 
-src/testdir/tiny.vim 
+src/po/*.ck
+src/testdir/mbyte.vim
+src/testdir/mzscheme.vim
+src/testdir/lua.vim
+src/testdir/small.vim
+src/testdir/tiny.vim
 src/testdir/test*.out
 src/testdir/test.log
+src/memfile_test

.hgtags

@@ -2981,3 +2981,128 @@ a43a8262e1ceffc393625c53a1ffed9e6bcaba62 v7-4-252
 afb542ea210cb9fc5fa8c5359bb4814370024b80 v7-4-256
 17903ded5e9a9d49ca73b324657b944f2954d4fd v7-4-257
 e8ffd1e6c8dc62c604d34e879791404bd15cab33 v7-4-258
+e4cd5bb75029d2c1208f3e31ebde4e03b16e8123 v7-4-259
+6bc874e4789a0f912b4fd6b23afecf19d80b1605 v7-4-260
+43c6cd07c8defd8505acbe479c6970764c08e6f9 v7-4-261
+0ea551fa607dc443b97c2fba97dc0c9cb0bcf303 v7-4-262
+af1bb39774f41c28eabd24d80cffc775695bc124 v7-4-263
+00acac0af680c2d8c82db5258474b121a5908926 v7-4-264
+8ec9d2196bee0c5108f2d2c196a660a7f4e5f29f v7-4-265
+8f84e906d454a95d3167678a745dde9de442b604 v7-4-266
+75f222d67cea335efbe0274de6340dba174c1e7e v7-4-267
+1a5ed2626b26a982e307a206572121a557adf709 v7-4-268
+81c26975e8f9dc7435353581346542409403f296 v7-4-269
+c519c446c5488bfd48c93a03efae4ae3e0c1f162 v7-4-270
+88b0571de4327ba5127a483493bd7d46e6a9850e v7-4-271
+00228400629e28384f7f52556c3c119ba0d0a44d v7-4-272
+747afb6a6de437131d9674e6b2bcc73d74863a89 v7-4-273
+1ee3fc5b40ae94c2a7fc5a62bca38d4f730f9bb2 v7-4-274
+8a3117a4887c1e12a1165c9719491f96753787d6 v7-4-275
+a6b59ee633a355095e6473ec5e2a7d9088bfb853 v7-4-276
+373204662d82e894b27ee76bc3319bc62c91f6ae v7-4-277
+b4ce0e1fb5a67d7d6b0bca8eaa3edc2e94a085d8 v7-4-278
+8e9db1f27a0063df023cc05a760fce73255dad24 v7-4-279
+daf7e98675cf395e1ef96f8040567affb2782a11 v7-4-280
+24c90f1fec859b54cf2b854b98c4c9e614c46061 v7-4-281
+6d0a1132dd71c7f55f7ed53fe99e97c79bfd05a4 v7-4-282
+aa99d04fa7e288a8580e3a5d4a9d6433a1572b48 v7-4-283
+3c35ca9666e88a8024af6dab585b8e79ab295f83 v7-4-284
+5cb1828fd0056de3c166e71fbafc67a74c57d7b1 v7-4-285
+be19015ef43cc17825929206790696c2e716035d v7-4-286
+66fe4908b649ba18426af6f69e8ccb01b487dcbd v7-4-287
+7965cb6a435ae1ea331c7c2f8740d3d4c3625f3b v7-4-288
+99374096a76b96d1128f5e6aa1fa92b4ba70fee9 v7-4-289
+b871734bf54ea185dbd2cc759d86dbfbe21cde26 v7-4-290
+b5972833add9de714f4651e26fd9ea63ec4a880c v7-4-291
+60cdaa05a6ad31cef55eb6b3dc1f57ecac6fcf79 v7-4-292
+10fc95f48546f438648b8357062e93c9c2c0a377 v7-4-293
+fdea5ea9afd139ea59dee6bdb3f1675b8b882bdf v7-4-294
+662ae48e7e246a63d38c9f3165b15b62252edaee v7-4-295
+53b87d790574b6d19034fb3390987c22fb928c58 v7-4-296
+81f5a056b2a582c8109da10cc538dc16a326a34d v7-4-297
+156f891d520e93eab5d3ce02784660fb13a3b0d3 v7-4-298
+daebf8ce66089c0c179fb436ceba359ef8d593d5 v7-4-299
+1157079ca5f167bcf8746dfc52ea5a85e6c87a30 v7-4-300
+8cb42aa3c4957a543e5dffe307475dbab969612f v7-4-301
+df141c80ea3a1ffcbf82d05c1314675231fcfa75 v7-4-302
+463ef551e9f62b63ac3f85f1f297b668b14bcd09 v7-4-303
+fed2e0967f8133ba9a44b0701f151c8d88c4896a v7-4-304
+63e7cc62402dffb180b40c04c63ceeb5f53957d7 v7-4-305
+05e1d8afcc5e375bf708ccc9810e2fd1a5a8a3cf v7-4-306
+06c10522d321d98874546b2a4d3b0ae145386f2e v7-4-307
+e3d2b8d83bb30c428a051f50791e454fcbc080af v7-4-308
+88a6e9f33822d33b6c32db578750c6c178c63f50 v7-4-309
+ccac0aa34eeaf46dad4b831461a532fc3fe71096 v7-4-310
+f6f7543043246107075f0d3739c471d51b7226da v7-4-311
+66eead134d6800fd4cf2d5d4b135d300c933f09a v7-4-312
+332a5c2b2956d9b18d85268a724d01deea27ec83 v7-4-313
+4d7af1962d6ce61df65fdc5c86544a61951f9517 v7-4-314
+646616b6ff4defcc7bef0b198b540f6d965a8126 v7-4-315
+0fc665889e8f0af532cb4e3be2f0ff0421bf2fbc v7-4-316
+8ffcb546d782121dfc9d88c7edc6f62421efce89 v7-4-317
+5c47dacf397c1c65d2dfc237b3ff395c66ec3d4d v7-4-318
+a076237d1c3849535681e82946a9041ed5525d7f v7-4-319
+f7bc601823e5c81e2ca412506a42eff9fd790ace v7-4-320
+c052937aae8ca5082f308b8ff0712c7eccdd30c8 v7-4-321
+fd96c55d683d76ece4ba01490d9796c13c988cdc v7-4-322
+238f5027830cad22e17a970483af9b160869cdf3 v7-4-323
+c476e0ac8b406693c3877baffa0e97ff25e59b06 v7-4-324
+1f288d2475488c3f44c7248e99019e2612580716 v7-4-325
+1dbcb23ae7a8b68ddbc28b4feb794c4c1db12395 v7-4-326
+99d8f2d72dcd4b850de81998cc9b1120c8165762 v7-4-327
+01d9ffdd6e6ffb39faf946e13ec63bd7dc31e162 v7-4-328
+018df65085f8990c1407442f8c783d4cee72a479 v7-4-329
+f9fa2e506b9f07549cd91074835c5c553db7b3a7 v7-4-330
+6d984caa0409fd284722c44cb09a0a2b5360bd4f v7-4-331
+8fed02d53b45848b0fff60de13d06858963cfb17 v7-4-332
+8ae50e3ef8bf733c0869c01b5132d02feffc0955 v7-4-333
+03d260a8ea0c0c67f424c387dbe2af5754e5e589 v7-4-334
+8ad2ecd116021ad5c945426e8bb80d741392b780 v7-4-335
+a42ba1e5099290a86cac1a9ac490c49e82e4c2cf v7-4-336
+0206ac84ff5fdce6d893c470e0909d2aed547a24 v7-4-337
+ef83b423ebf7de11c1063c795dd2186a9b59b90f v7-4-338
+fd7110d0c3bf4fea3cfa3d16da6c2a945d327c27 v7-4-339
+03f95f5e311b84653df70fb3c08a9d92cf21b8f0 v7-4-340
+adc4a84f72eb44dae657af713922a6e2c1f64ae3 v7-4-341
+8dcc6f142460b2d5eee119a174d441d46d95cd99 v7-4-342
+539ce56d8f35fe2deb5c4f57335e1adf97ae4e74 v7-4-343
+ce284c205558d103326a4c3f22f181774690b3eb v7-4-344
+ea2c5dfee1b04d216ebf992c5f46ecbdfee2854a v7-4-345
+3248c6e40aee01a7254d111dd846c6ec7889a804 v7-4-346
+a162d41f10e1c3c8673d86d8b0c58fdaf1bddeaf v7-4-347
+0b7586868f6da0372af7510650240e22dc1e6e64 v7-4-348
+79950dae1d7de8fc2cb0f8ddd087d403e2b9ce8e v7-4-349
+ad005d0114c1d2d83490787ef7ea2a3c6e5e7b9e v7-4-350
+f9ec944e4474c649faad642797ffd798a7102549 v7-4-351
+b4962cf3a1c06a1f60f1d750df8fcf7035b00b99 v7-4-352
+d42a1d3b74d40f580359dbd139d2d0dfa7235252 v7-4-353
+5deaa4e9812d4b4ae59d8a3e70bf19983e07e6da v7-4-354
+9a4efda75b5ef0f496d6a29c0a4dfcc7c03412f9 v7-4-355
+34465a179ce21c827cab4c65a75e6b490600a96f v7-4-356
+4eedfc4911a1db9c4874689f6c652be0094838f2 v7-4-357
+771b97ba3b4768c77f2070423a93152d6977f012 v7-4-358
+182c7b987283a567121e9c43d831779d1c88645f v7-4-359
+761687c6808f4c9c80d33a919a6bb506dfe9f674 v7-4-360
+a97e5b9dbc26800830e46cf3c1aa6efbfe258097 v7-4-361
+7fa2bed947fde3514a700c96861a537d816d6fd4 v7-4-362
+ff3816167b73fde35017d364b1a820014cd42e76 v7-4-363
+7b324826757595b21b0410a7b6f00227d73c655f v7-4-364
+4625fa27ba6f5b06294675b7f0d1bf8ae8f249fb v7-4-365
+ad775b58706587b6acfb0bb2c732e184efe4f778 v7-4-366
+bdbe2037066df6a463346be1768a56d98001fb36 v7-4-367
+021e16be3c026c9f883b2aba0b48469ecbae5d88 v7-4-368
+72ee0db83788638c36bbcb076cabc2ba6c8cd4e7 v7-4-369
+50575818a97fa4777e52272f5ffc769179d76a8d v7-4-370
+d44f298c43c74555f4ea21b710d377133f948d61 v7-4-371
+a122efb555c4f08405051369310451a627ed524b v7-4-372
+353330c512a9488cf5c1a3f8b8a57fa8cdd83a7a v7-4-373
+f59c4bf0ac3b525f703cafba9a9cb0aeb3cc7745 v7-4-374
+5a5492d676ab1e8334aa86ec552e7e33ee8828e1 v7-4-375
+c3bb76e5b2355c57d7f89997aa9e125e46afdea1 v7-4-376
+255561411d7ae4b3c713bfb2e2f13c5f08ce0c61 v7-4-377
+75ae211df37d789c54f660ccddddd0e370aa67ae v7-4-378
+16cfdf28be40ccbefaeb80ec574a098362a36a34 v7-4-379
+7cfbad4a78bf306e5aaf84dc9c29b48e7d77c1ef v7-4-380
+0a3d958e346ee051667d3e541273b78fb1dfed9a v7-4-381
+dbd7dc1ea2e6bd0fc3c9ec7faec76382412d0129 v7-4-382
+2f02675bc4b051fff7be63f5107f659045a010e1 v7-4-383

Filelist

@@ -3,6 +3,7 @@
 
 # source files for all source archives
 SRC_ALL =	\
+		.hgignore \
 		src/README.txt \
 		src/arabic.c \
 		src/arabic.h \
@@ -88,6 +89,7 @@ SRC_ALL =	\
 		src/testdir/test60.vim \
 		src/testdir/test83-tags? \
 		src/testdir/test77a.com \
+		src/testdir/test_*.vim \
 		src/testdir/python2/*.py \
 		src/testdir/python3/*.py \
 		src/testdir/pythonx/*.py \

runtime/autoload/htmlcomplete.vim

@@ -1,7 +1,49 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2011 Apr 28
+" Last Change:	2014 Jun 20
+
+" Distinguish between HTML versions.
+" To use with other HTML versions add another "elseif" condition to match
+" proper DOCTYPE.
+function! htmlcomplete#DetectOmniFlavor()
+  if &filetype == 'xhtml'
+    let b:html_omni_flavor = 'xhtml10s'
+  else
+    let b:html_omni_flavor = 'html401t'
+  endif
+  let i = 1
+  let line = ""
+  while i < 10 && i < line("$")
+    let line = getline(i)
+    if line =~ '<!DOCTYPE.*\<DTD '
+      break
+    endif
+    let i += 1
+  endwhile
+  if line =~ '<!DOCTYPE.*\<DTD '  " doctype line found above
+    if line =~ ' HTML 3\.2'
+      let b:html_omni_flavor = 'html32'
+    elseif line =~ ' XHTML 1\.1'
+      let b:html_omni_flavor = 'xhtml11'
+    else    " two-step detection with strict/frameset/transitional
+      if line =~ ' XHTML 1\.0'
+	let b:html_omni_flavor = 'xhtml10'
+      elseif line =~ ' HTML 4\.01'
+	let b:html_omni_flavor = 'html401'
+      elseif line =~ ' HTML 4.0\>'
+	let b:html_omni_flavor = 'html40'
+      endif
+      if line =~ '\<Transitional\>'
+	let b:html_omni_flavor .= 't'
+      elseif line =~ '\<Frameset\>'
+	let b:html_omni_flavor .= 'f'
+      else
+	let b:html_omni_flavor .= 's'
+      endif
+    endif
+  endif
+endfunction
 
 function! htmlcomplete#CompleteTags(findstart, base)
   if a:findstart