Merge branch 'vim' into fix/fast-join
commit1a2490671b7086fcd150270b97b7674d82da0a4a
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 9 Jul 2009 21:57:48 +0000 (9 23:57 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 9 Jul 2009 21:57:48 +0000 (9 23:57 +0200)
tree367297e5bc2511974f440ac6b8b7ea0958bcacf6
parent9f6c47602febd36788b09e9b700551c43f989859
parent1e925c2b1f58d3d979289eb07f12a1e2a5a6a6f4
Merge branch 'vim' into fix/fast-join
src/edit.c
src/ex_docmd.c