Merge remote-tracking branch 'vim/master' into kaoriya

Conflicts:
	runtime/doc/diff.txt
	runtime/doc/editing.txt
	runtime/doc/eval.txt
	runtime/doc/map.txt
	runtime/doc/options.txt
	runtime/doc/repeat.txt
	runtime/doc/todo.txt
	runtime/filetype.vim
	runtime/ftplugin/man.vim
	runtime/syntax/diff.vim
	runtime/syntax/j.vim

Author: splhack

.hgtags

@@ -3250,3 +3250,105 @@ e6c5ff35500d907cad9bfa1f6babdc08a4a90aa0 v7-4-514
 2587209317b75d073c352c61f1e6cd9f8c26d7f5 v7-4-525
 230b52b9d35ec12f6a83368b3479dfb85158bcf9 v7-4-526
 2bb019eb60ca1d16e62e95bef16475756965022f v7-4-527
+5f49ac8426dfddcc6725fae872b642976e468c8a v7-4-528
+72d5a533ec87c13e87e80273a1817b5ba19d313b v7-4-529
+5a76e36f07b160b44b4f4e637decbc914a243e6c v7-4-530
+2c0cddd0df8c8ca0c08027e7866f697ffd20d6fb v7-4-531
+7f48abe500e13554d14f5efae736da871a89ebae v7-4-532
+18953e121be6993e8e87a7d6fd49321ecfc2dcab v7-4-533
+ee28ddfc7b7c66b7c2a87ed95dd1d4cae7902a75 v7-4-534
+83c5fd1b55bc6b2b49b4653cc98985b8dd3fc728 v7-4-535
+d51d47bd77c2f042f9893d9c528a5f2fe75eb872 v7-4-536
+01c668384bcc7fd0f8572a8de2dfc3b2ead7eff0 v7-4-537
+3421b24e419c935f3914a4bf7eb6d3b1de3d618f v7-4-538
+77fe94082f5396c2e40f732b30c9d76984969694 v7-4-539
+93aca8cdd7b8cc1d9e921e243c7c2b6c7fd5f730 v7-4-540
+9fbb9c60ab41765a0d9f02b0b6d48cabe7270f0e v7-4-541
+de877dab1c3163a95ac8e7d3d6c3083a64e3c093 v7-4-542
+f673842874b6aa9fdbf3f3d9fafc67fe4debcbf6 v7-4-543
+89143424f604cd610f7e709ac683dc28a473e078 v7-4-544
+d2239abd3edb1e3672916c15ea8df6a01d1b86c6 v7-4-545
+84190359b9799b0ecb4d9e8e421471e14f659616 v7-4-546
+19726451aabea7e3640c56703846991c35e59e98 v7-4-547
+26a20ce3532c5e3f47f12facc28a5477fedc9e31 v7-4-548
+1fd9f1d43660f9645d8dabfd14131371aa2f529f v7-4-549
+7cda721eadb04f555a912b220c9047f504480bc6 v7-4-550
+eb0fb921e197c7b1294e1142479c982d1770eaa0 v7-4-551
+c8d6dbdd11563d39c42f16a80f9c74bc68155f7a v7-4-552
+e13f8073c9f9b8f2e80f32cf0c13073304a3f967 v7-4-553
+7e4c22ecc679455fdf3e1eec6681d13d998bebe2 v7-4-554
+c124393788693271b446ba24b55dca407e765bbe v7-4-555
+a35752526cd050f35306bac3dc04ac4a34a9f309 v7-4-556
+fcd5a3207100a1f75d96ead301249c60b4f23d79 v7-4-557
+48111d5fd8a8b133b32fa92137a56ae910915370 v7-4-558
+29f5cfca338897412e3a7c819085c1fe36da2135 v7-4-559
+86aacd619ac0ab9b6b6519cf132367b744adf8f0 v7-4-560
+82c6a3bddb23c7343fefc271b33960a20506ead5 v7-4-561
+b5df99582638f6f6cad794b7049453d7ff2c70b2 v7-4-562
+9dc52b404c1b3f32d36df2841c4c8eddea6e4407 v7-4-563
+9657929ee56251b52885cd0660941b0aab2af3ba v7-4-564
+22f95a018b13dc9d8a3246d990a1ea0b5b3a264d v7-4-565
+a88d4dc02bf438ff9e6ee119be8188e342ea459e v7-4-566
+0b245c8dbd19755e08b5248110a537a74ddb92c4 v7-4-567
+747cbac7047bf8d003ff0672b25b60e0236fdb1b v7-4-568
+ccb6962585f1ea5e7f872d79e59565e7a95234db v7-4-569
+816c584ff1740cd118d5a35fbea98ed28ed2e2e2 v7-4-570
+97b2ff29ae3a213b5c72bd8ea3aa2442ef355e08 v7-4-571
+cba15023c40371ed51ee0ed50fbdf23d6860f0ba v7-4-572
+8cfbc34ae4aa2b91b5b012b2e8dfe86327b449c9 v7-4-573
+45ff9dd354eaff958c0ba646134e1f5cd6e9186f v7-4-574
+fe0f33ac63af3c16a9920fe08bd3582aa0f02f50 v7-4-575
+749fc929da45d07efc5352dd8a0c00f8ed9f2163 v7-4-576
+bcf9d3a6007fff06d0521339f93dc870e5231eaa v7-4-577
+b7b3afcae90e5b8e9f57ec3b172fed14f6912579 v7-4-578
+134a7d55f9fa170c8c4591328eb550e70b756616 v7-4-579
+a5a6f1467b1ea73697b3265d8f12805bd998c81e v7-4-580
+e1874a4524f8c97efed78e215fd5ff91f3569351 v7-4-581
+dfd593d81818468ad60cad4fc66c561299f8d969 v7-4-582
+f2978794e801bfe8a587865492302cc0a16783cc v7-4-583
+79b3d83592c5ad63ce0c8d276d15f570e95dd941 v7-4-584
+1d3139ae6ce67d69ce8bc221bfc67dc1b47e95d9 v7-4-585
+667cb2eb17a52d9ac28a1b6f686935814e769ecd v7-4-586
+70793fedd25a509568abbd4026565675e830b1ca v7-4-587
+a03e143b93587cf29c91121acdf66f6e5dc6e470 v7-4-588
+8ff2d1b611bfeb17b594262cbf9313f819b4483a v7-4-589
+5b8d26b85437ffa91cd586fa138aba80bba897a9 v7-4-590
+7b8e3be930f39af3cdc1fe969a6de16f2d91e5d2 v7-4-591
+005a6b65086666ed56531e4c8a531a3ee0cea638 v7-4-592
+bdc8e71633e45ebe5f1b59e4328fcf22a5866cb7 v7-4-593
+f9d02ce2f745f75003ff570b2a596c755ccc86ba v7-4-594
+d83436d119871584ddb012ecf0aa4d01030f65ee v7-4-595
+6da912e32896c57227a0f297aa1d3312a653cf0a v7-4-596
+c124a8f34ed1cf510d384b384db6f34be5d61a3e v7-4-597
+b01ca71f93b293ba93489bc2320c12caf61bf289 v7-4-598
+1ef8ce97fc40b59d7218d7300685d40df63a407c v7-4-599
+436d6c9e57f2f6def73e86891cbf72a0328aa9bd v7-4-600
+2561531decf15c1a02f62a1b96ff778e12a5dcbc v7-4-601
+4e31d9f7c896a346b2346fc4ff005b8b255172c9 v7-4-602
+0c8738124a7b9d6d1d3e18124ad97310e9618c92 v7-4-603
+f625b6302d048df7d9f9e738b773f91dd4bbd58e v7-4-604
+c1ed973fb58faa650dcd4d25a98c669edb8ca0d4 v7-4-605
+22f164bd7e8ea7de1e4c2a41020dde971112b862 v7-4-606
+52b89a52ffd4f2a925b42be1aa8041bc0c0dff31 v7-4-607
+6b86d256fd3360a5a0a8f89c3efeda4e961153c0 v7-4-608
+38add5a3d617109be3be5e4c0d0b7a32ab2a2e00 v7-4-609
+d6473d6501fd0d1c9113590bf29a4195bf4337bb v7-4-610
+7fa1a7359a56531ec52ba527b3c1c1a7c8b9464c v7-4-611
+75238dbe85432f4980aee44b25921880b3122f64 v7-4-612
+ffba266e064d1b951bfc9531adc664aab60cded1 v7-4-613
+a7e485b683d8df14c3fe0833c7b4928098914aa0 v7-4-614
+7092ec5d5ef1f6f399d7e6b36c2cdd73bc1b3ac3 v7-4-615
+a287b0e9e87b238bd72b5340cd8fa37807de7525 v7-4-616
+05202d6ba0ef2b1430519fda8bdb59576b1b01a8 v7-4-617
+d129b939a19065a0a5302077d2a9737ed2dc0bf0 v7-4-618
+9ac723b9f54dfbf2c1d05a26a129e94af6a1d72c v7-4-619
+1ffe91b5e51408d9f68ed8651bb3a85f68365ad1 v7-4-620
+f884a1140a0a143ad21b08166e2b72dd131b78c2 v7-4-621
+599112d00aa96072d75b1d6a5bcd7123d055daa5 v7-4-622
+3cca9b0cc1a0d31ac6c6a0b69544dee96ff280b4 v7-4-623
+f8f2a61e538d4094e29db47954516d572b2dcca4 v7-4-624
+4b1e3b3aa78abcdab840189d766f54ebdb2712fe v7-4-625
+68e0e6bb8250f9b595b517e7061e83796a4b3ec0 v7-4-626
+c77ef1bf9623d0c7ebd7e011e6ce7a3a12b0bf41 v7-4-627
+6eecaf5a18ca95f0ff06dc2ac88015e6bb6f70ac v7-4-628
+f28c171348fbfe055c86a354b4d235e2786215d9 v7-4-629