Introduce nvim namespace: Move files.

Move files from src/ to src/nvim/.
- src/nvim/ becomes the new root dir for nvim executable sources.
- src/libnvim/ is planned to become root dir of the neovim library.

463 files changed, 0 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 7638346abc..7638346abc 100644
--- a/src/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
diff --git a/src/api/buffer.c b/src/nvim/api/buffer.c
index 328b26061d..328b26061d 100644
--- a/src/api/buffer.c
+++ b/src/nvim/api/buffer.c
diff --git a/src/api/buffer.h b/src/nvim/api/buffer.h
index 04f9422c19..04f9422c19 100644
--- a/src/api/buffer.h
+++ b/src/nvim/api/buffer.h
diff --git a/src/api/defs.h b/src/nvim/api/defs.h
index 0ac2e790d2..0ac2e790d2 100644
--- a/src/api/defs.h
+++ b/src/nvim/api/defs.h
diff --git a/src/api/helpers.c b/src/nvim/api/helpers.c
index 51b1dcb754..51b1dcb754 100644
--- a/src/api/helpers.c
+++ b/src/nvim/api/helpers.c
diff --git a/src/api/helpers.h b/src/nvim/api/helpers.h
index afa16e54f4..afa16e54f4 100644
--- a/src/api/helpers.h
+++ b/src/nvim/api/helpers.h
diff --git a/src/api/tabpage.c b/src/nvim/api/tabpage.c
index 27f0aba99c..27f0aba99c 100644
--- a/src/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
diff --git a/src/api/tabpage.h b/src/nvim/api/tabpage.h
index ccd6c7ab9e..ccd6c7ab9e 100644
--- a/src/api/tabpage.h
+++ b/src/nvim/api/tabpage.h
diff --git a/src/api/vim.c b/src/nvim/api/vim.c
index f9fa21550e..f9fa21550e 100644
--- a/src/api/vim.c
+++ b/src/nvim/api/vim.c
diff --git a/src/api/vim.h b/src/nvim/api/vim.h
index ceb696ff76..ceb696ff76 100644
--- a/src/api/vim.h
+++ b/src/nvim/api/vim.h
diff --git a/src/api/window.c b/src/nvim/api/window.c
index 2c67fc2a74..2c67fc2a74 100644
--- a/src/api/window.c
+++ b/src/nvim/api/window.c
diff --git a/src/api/window.h b/src/nvim/api/window.h
index e9baa3f170..e9baa3f170 100644
--- a/src/api/window.h
+++ b/src/nvim/api/window.h
diff --git a/src/arabic.c b/src/nvim/arabic.c
index 54f88f8757..54f88f8757 100644
--- a/src/arabic.c
+++ b/src/nvim/arabic.c
diff --git a/src/arabic.h b/src/nvim/arabic.h
index 5129b5a56a..5129b5a56a 100644
--- a/src/arabic.h
+++ b/src/nvim/arabic.h
diff --git a/src/ascii.h b/src/nvim/ascii.h
index cf488c56a7..cf488c56a7 100644
--- a/src/ascii.h
+++ b/src/nvim/ascii.h
diff --git a/src/blowfish.c b/src/nvim/blowfish.c
index 67712a2fbc..67712a2fbc 100644
--- a/src/blowfish.c
+++ b/src/nvim/blowfish.c
diff --git a/src/blowfish.h b/src/nvim/blowfish.h
index 288187f433..288187f433 100644
--- a/src/blowfish.h
+++ b/src/nvim/blowfish.h
diff --git a/src/buffer.c b/src/nvim/buffer.c
index 7cd773b55c..7cd773b55c 100644
--- a/src/buffer.c
+++ b/src/nvim/buffer.c
diff --git a/src/buffer.h b/src/nvim/buffer.h
index 8c85d0363a..8c85d0363a 100644
--- a/src/buffer.h
+++ b/src/nvim/buffer.h
diff --git a/src/buffer_defs.h b/src/nvim/buffer_defs.h
index d78cf0651f..d78cf0651f 100644
--- a/src/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
diff --git a/src/charset.c b/src/nvim/charset.c
index 5217eb2c0a..5217eb2c0a 100644
--- a/src/charset.c
+++ b/src/nvim/charset.c
diff --git a/src/charset.h b/src/nvim/charset.h
index 169c83ccc1..169c83ccc1 100644
--- a/src/charset.h
+++ b/src/nvim/charset.h
diff --git a/src/crypt.c b/src/nvim/crypt.c
index 72d4a89c63..72d4a89c63 100644
--- a/src/crypt.c
+++ b/src/nvim/crypt.c
diff --git a/src/crypt.h b/src/nvim/crypt.h
index 8794360dd5..8794360dd5 100644
--- a/src/crypt.h
+++ b/src/nvim/crypt.h
diff --git a/src/cursor_shape.c b/src/nvim/cursor_shape.c
index 19db088817..19db088817 100644
--- a/src/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
diff --git a/src/cursor_shape.h b/src/nvim/cursor_shape.h
index 33a120e1c4..33a120e1c4 100644
--- a/src/cursor_shape.h
+++ b/src/nvim/cursor_shape.h
diff --git a/src/diff.c b/src/nvim/diff.c
index e360edc665..e360edc665 100644
--- a/src/diff.c
+++ b/src/nvim/diff.c
diff --git a/src/diff.h b/src/nvim/diff.h
index 223fe8add2..223fe8add2 100644
--- a/src/diff.h
+++ b/src/nvim/diff.h
diff --git a/src/digraph.c b/src/nvim/digraph.c
index 7ab8bd181d..7ab8bd181d 100644
--- a/src/digraph.c
+++ b/src/nvim/digraph.c
diff --git a/src/digraph.h b/src/nvim/digraph.h
index 796066bb68..796066bb68 100644
--- a/src/digraph.h
+++ b/src/nvim/digraph.h
diff --git a/src/edit.c b/src/nvim/edit.c
index 146a8bba70..146a8bba70 100644
--- a/src/edit.c
+++ b/src/nvim/edit.c
diff --git a/src/edit.h b/src/nvim/edit.h
index 3ab0f1ba59..3ab0f1ba59 100644
--- a/src/edit.h
+++ b/src/nvim/edit.h
diff --git a/src/eval.c b/src/nvim/eval.c
index 98ab1ea2fe..98ab1ea2fe 100644
--- a/src/eval.c
+++ b/src/nvim/eval.c
diff --git a/src/eval.h b/src/nvim/eval.h
index 20d6bfe119..20d6bfe119 100644
--- a/src/eval.h
+++ b/src/nvim/eval.h
diff --git a/src/eval_defs.h b/src/nvim/eval_defs.h
index aa086c3278..aa086c3278 100644
--- a/src/eval_defs.h
+++ b/src/nvim/eval_defs.h
diff --git a/src/ex_cmds.c b/src/nvim/ex_cmds.c
index 3613a02cb3..3613a02cb3 100644
--- a/src/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
diff --git a/src/ex_cmds.h b/src/nvim/ex_cmds.h
index f2cee3d7a0..f2cee3d7a0 100644
--- a/src/ex_cmds.h
+++ b/src/nvim/ex_cmds.h
diff --git a/src/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 0837e5386e..0837e5386e 100644
--- a/src/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
diff --git a/src/ex_cmds2.h b/src/nvim/ex_cmds2.h
index 5a84206a0e..5a84206a0e 100644
--- a/src/ex_cmds2.h
+++ b/src/nvim/ex_cmds2.h
diff --git a/src/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 6497e98480..6497e98480 100644
--- a/src/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
diff --git a/src/ex_docmd.c b/src/nvim/ex_docmd.c
index 87ce252434..87ce252434 100644
--- a/src/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
diff --git a/src/ex_docmd.h b/src/nvim/ex_docmd.h
index 3cc134aab2..3cc134aab2 100644
--- a/src/ex_docmd.h
+++ b/src/nvim/ex_docmd.h
diff --git a/src/ex_eval.c b/src/nvim/ex_eval.c
index fc0887ca03..fc0887ca03 100644
--- a/src/ex_eval.c
+++ b/src/nvim/ex_eval.c
diff --git a/src/ex_eval.h b/src/nvim/ex_eval.h
index 4fcf4760ff..4fcf4760ff 100644
--- a/src/ex_eval.h
+++ b/src/nvim/ex_eval.h
diff --git a/src/ex_getln.c b/src/nvim/ex_getln.c
index 8e2d7cc9ae..8e2d7cc9ae 100644
--- a/src/ex_getln.c
+++ b/src/nvim/ex_getln.c
diff --git a/src/ex_getln.h b/src/nvim/ex_getln.h
index 32980783b2..32980783b2 100644
--- a/src/ex_getln.h
+++ b/src/nvim/ex_getln.h
diff --git a/src/farsi.c b/src/nvim/farsi.c
index ea9432ac8b..ea9432ac8b 100644
--- a/src/farsi.c
+++ b/src/nvim/farsi.c
diff --git a/src/farsi.h b/src/nvim/farsi.h
index c5ee336a0f..c5ee336a0f 100644
--- a/src/farsi.h
+++ b/src/nvim/farsi.h
diff --git a/src/file_search.c b/src/nvim/file_search.c
index 96f0b71b73..96f0b71b73 100644
--- a/src/file_search.c
+++ b/src/nvim/file_search.c
diff --git a/src/file_search.h b/src/nvim/file_search.h
index 13c09a122d..13c09a122d 100644
--- a/src/file_search.h
+++ b/src/nvim/file_search.h
diff --git a/src/fileio.c b/src/nvim/fileio.c
index 4fc73d8ebf..4fc73d8ebf 100644
--- a/src/fileio.c
+++ b/src/nvim/fileio.c
diff --git a/src/fileio.h b/src/nvim/fileio.h
index 960ba26fa3..960ba26fa3 100644
--- a/src/fileio.h
+++ b/src/nvim/fileio.h
diff --git a/src/fold.c b/src/nvim/fold.c
index 143b35ea10..143b35ea10 100644
--- a/src/fold.c
+++ b/src/nvim/fold.c
diff --git a/src/fold.h b/src/nvim/fold.h
index 5023511e0d..5023511e0d 100644
--- a/src/fold.h
+++ b/src/nvim/fold.h
diff --git a/src/func_attr.h b/src/nvim/func_attr.h
index 4275d23ff1..4275d23ff1 100644
--- a/src/func_attr.h
+++ b/src/nvim/func_attr.h
diff --git a/src/garray.c b/src/nvim/garray.c
index e1046ceb5e..e1046ceb5e 100644
--- a/src/garray.c
+++ b/src/nvim/garray.c
diff --git a/src/garray.h b/src/nvim/garray.h
index 2a0deacef7..2a0deacef7 100644
--- a/src/garray.h
+++ b/src/nvim/garray.h
diff --git a/src/getchar.c b/src/nvim/getchar.c
index 99dbc11e4d..99dbc11e4d 100644
--- a/src/getchar.c
+++ b/src/nvim/getchar.c
diff --git a/src/getchar.h b/src/nvim/getchar.h
index b91af5e7a6..b91af5e7a6 100644
--- a/src/getchar.h
+++ b/src/nvim/getchar.h
diff --git a/src/globals.h b/src/nvim/globals.h
index d856a4c155..d856a4c155 100644
--- a/src/globals.h
+++ b/src/nvim/globals.h
diff --git a/src/hardcopy.c b/src/nvim/hardcopy.c
index 1c334e76de..1c334e76de 100644
--- a/src/hardcopy.c
+++ b/src/nvim/hardcopy.c
diff --git a/src/hardcopy.h b/src/nvim/hardcopy.h
index 0ae206517b..0ae206517b 100644
--- a/src/hardcopy.h
+++ b/src/nvim/hardcopy.h
diff --git a/src/hashtab.c b/src/nvim/hashtab.c
index f8ec7453be..f8ec7453be 100644
--- a/src/hashtab.c
+++ b/src/nvim/hashtab.c
diff --git a/src/hashtab.h b/src/nvim/hashtab.h
index 4285358bea..4285358bea 100644
--- a/src/hashtab.h
+++ b/src/nvim/hashtab.h
diff --git a/src/if_cscope.c b/src/nvim/if_cscope.c
index b000b03444..b000b03444 100644
--- a/src/if_cscope.c
+++ b/src/nvim/if_cscope.c
diff --git a/src/if_cscope.h b/src/nvim/if_cscope.h
index 74d4df83ea..74d4df83ea 100644
--- a/src/if_cscope.h
+++ b/src/nvim/if_cscope.h
diff --git a/src/if_cscope_defs.h b/src/nvim/if_cscope_defs.h
index 3c64067795..3c64067795 100644
--- a/src/if_cscope_defs.h
+++ b/src/nvim/if_cscope_defs.h
diff --git a/src/indent.c b/src/nvim/indent.c
index 61fe5ab251..61fe5ab251 100644
--- a/src/indent.c
+++ b/src/nvim/indent.c
diff --git a/src/indent.h b/src/nvim/indent.h
index 8b2ebfaf89..8b2ebfaf89 100644
--- a/src/indent.h
+++ b/src/nvim/indent.h
diff --git a/src/indent_c.c b/src/nvim/indent_c.c
index 77ca3a34cb..77ca3a34cb 100644
--- a/src/indent_c.c
+++ b/src/nvim/indent_c.c
diff --git a/src/indent_c.h b/src/nvim/indent_c.h
index 7b181e6768..7b181e6768 100644
--- a/src/indent_c.h
+++ b/src/nvim/indent_c.h
diff --git a/src/keymap.c b/src/nvim/keymap.c
index bec179c913..bec179c913 100644
--- a/src/keymap.c
+++ b/src/nvim/keymap.c
diff --git a/src/keymap.h b/src/nvim/keymap.h
index 244e9b3ddf..244e9b3ddf 100644
--- a/src/keymap.h
+++ b/src/nvim/keymap.h
diff --git a/src/lib/khash.h b/src/nvim/lib/khash.h
index 6b73b980e4..6b73b980e4 100644
--- a/src/lib/khash.h
+++ b/src/nvim/lib/khash.h
diff --git a/src/lib/klist.h b/src/nvim/lib/klist.h
index f8b16ea9fa..f8b16ea9fa 100644
--- a/src/lib/klist.h
+++ b/src/nvim/lib/klist.h
diff --git a/src/log.c b/src/nvim/log.c
index 5d536c62e5..5d536c62e5 100644
--- a/src/log.c
+++ b/src/nvim/log.c
diff --git a/src/log.h b/src/nvim/log.h
index 45c8fdbfd8..45c8fdbfd8 100644
--- a/src/log.h
+++ b/src/nvim/log.h
diff --git a/src/macros.h b/src/nvim/macros.h
index 9bfe3d054b..9bfe3d054b 100644
--- a/src/macros.h
+++ b/src/nvim/macros.h
diff --git a/src/main.c b/src/nvim/main.c
index 828a6d5200..828a6d5200 100644
--- a/src/main.c
+++ b/src/nvim/main.c
diff --git a/src/main.h b/src/nvim/main.h
index df3e10aa38..df3e10aa38 100644
--- a/src/main.h
+++ b/src/nvim/main.h
diff --git a/src/map.c b/src/nvim/map.c
index 3e2bbe03e0..3e2bbe03e0 100644
--- a/src/map.c
+++ b/src/nvim/map.c
diff --git a/src/map.h b/src/nvim/map.h
index 9e61b903d5..9e61b903d5 100644
--- a/src/map.h
+++ b/src/nvim/map.h
diff --git a/src/map_defs.h b/src/nvim/map_defs.h
index d732b0fa66..d732b0fa66 100644
--- a/src/map_defs.h
+++ b/src/nvim/map_defs.h
diff --git a/src/mark.c b/src/nvim/mark.c
index 5aa1212c0d..5aa1212c0d 100644
--- a/src/mark.c
+++ b/src/nvim/mark.c
diff --git a/src/mark.h b/src/nvim/mark.h
index 203e10d118..203e10d118 100644
--- a/src/mark.h
+++ b/src/nvim/mark.h
diff --git a/src/mark_defs.h b/src/nvim/mark_defs.h
index eb8d5a9767..eb8d5a9767 100644
--- a/src/mark_defs.h
+++ b/src/nvim/mark_defs.h
diff --git a/src/mbyte.c b/src/nvim/mbyte.c
index 09cb1ce35b..09cb1ce35b 100644
--- a/src/mbyte.c
+++ b/src/nvim/mbyte.c
diff --git a/src/mbyte.h b/src/nvim/mbyte.h
index 896b7fbaa0..896b7fbaa0 100644
--- a/src/mbyte.h
+++ b/src/nvim/mbyte.h
diff --git a/src/memfile.c b/src/nvim/memfile.c
index 9431101d8d..9431101d8d 100644
--- a/src/memfile.c
+++ b/src/nvim/memfile.c
diff --git a/src/memfile.h b/src/nvim/memfile.h
index 283d7795ca..283d7795ca 100644
--- a/src/memfile.h
+++ b/src/nvim/memfile.h
diff --git a/src/memfile_defs.h b/src/nvim/memfile_defs.h
index e614cae7ca..e614cae7ca 100644
--- a/src/memfile_defs.h
+++ b/src/nvim/memfile_defs.h
diff --git a/src/memline.c b/src/nvim/memline.c
index a01506756f..a01506756f 100644
--- a/src/memline.c
+++ b/src/nvim/memline.c
diff --git a/src/memline.h b/src/nvim/memline.h
index 6f68409ba4..6f68409ba4 100644
--- a/src/memline.h
+++ b/src/nvim/memline.h
diff --git a/src/memline_defs.h b/src/nvim/memline_defs.h
index 5878cfd7d9..5878cfd7d9 100644
--- a/src/memline_defs.h
+++ b/src/nvim/memline_defs.h
diff --git a/src/memory.c b/src/nvim/memory.c
index 53214d5265..53214d5265 100644
--- a/src/memory.c
+++ b/src/nvim/memory.c
diff --git a/src/memory.h b/src/nvim/memory.h
index 0249b19464..0249b19464 100644
--- a/src/memory.h
+++ b/src/nvim/memory.h
diff --git a/src/menu.c b/src/nvim/menu.c
index e454b8c971..e454b8c971 100644
--- a/src/menu.c
+++ b/src/nvim/menu.c
diff --git a/src/menu.h b/src/nvim/menu.h
index 04e21cdd54..04e21cdd54 100644
--- a/src/menu.h
+++ b/src/nvim/menu.h
diff --git a/src/message.c b/src/nvim/message.c
index feb1226e6d..feb1226e6d 100644
--- a/src/message.c
+++ b/src/nvim/message.c
diff --git a/src/message.h b/src/nvim/message.h
index 2db9bfc85c..2db9bfc85c 100644
--- a/src/message.h
+++ b/src/nvim/message.h
diff --git a/src/misc1.c b/src/nvim/misc1.c
index 26b649331a..26b649331a 100644
--- a/src/misc1.c
+++ b/src/nvim/misc1.c
diff --git a/src/misc1.h b/src/nvim/misc1.h
index a46b305fae..a46b305fae 100644
--- a/src/misc1.h
+++ b/src/nvim/misc1.h
diff --git a/src/misc2.c b/src/nvim/misc2.c
index 8d556db347..8d556db347 100644
--- a/src/misc2.c
+++ b/src/nvim/misc2.c
diff --git a/src/misc2.h b/src/nvim/misc2.h
index 2e292c8fc7..2e292c8fc7 100644
--- a/src/misc2.h
+++ b/src/nvim/misc2.h
diff --git a/src/move.c b/src/nvim/move.c
index f234d968a6..f234d968a6 100644
--- a/src/move.c
+++ b/src/nvim/move.c
diff --git a/src/move.h b/src/nvim/move.h
index 571b0a7743..571b0a7743 100644
--- a/src/move.h
+++ b/src/nvim/move.h
diff --git a/src/normal.c b/src/nvim/normal.c
index dc0035fe85..dc0035fe85 100644
--- a/src/normal.c
+++ b/src/nvim/normal.c
diff --git a/src/normal.h b/src/nvim/normal.h
index c5ca1b9bde..c5ca1b9bde 100644
--- a/src/normal.h
+++ b/src/nvim/normal.h
diff --git a/src/ops.c b/src/nvim/ops.c
index 30606b077e..30606b077e 100644
--- a/src/ops.c
+++ b/src/nvim/ops.c
diff --git a/src/ops.h b/src/nvim/ops.h
index 51bb64cf29..51bb64cf29 100644
--- a/src/ops.h
+++ b/src/nvim/ops.h
diff --git a/src/option.c b/src/nvim/option.c
index 89069d96ef..89069d96ef 100644
--- a/src/option.c
+++ b/src/nvim/option.c
diff --git a/src/option.h b/src/nvim/option.h
index ec27e1b493..ec27e1b493 100644
--- a/src/option.h
+++ b/src/nvim/option.h
diff --git a/src/option_defs.h b/src/nvim/option_defs.h
index cfd6a6d31f..cfd6a6d31f 100644
--- a/src/option_defs.h
+++ b/src/nvim/option_defs.h
diff --git a/src/os/channel.c b/src/nvim/os/channel.c
index 2427db2a14..2427db2a14 100644
--- a/src/os/channel.c
+++ b/src/nvim/os/channel.c
diff --git a/src/os/channel.h b/src/nvim/os/channel.h
index c58e91a0e5..c58e91a0e5 100644
--- a/src/os/channel.h
+++ b/src/nvim/os/channel.h
diff --git a/src/os/channel_defs.h b/src/nvim/os/channel_defs.h
index 27ba103fbe..27ba103fbe 100644
--- a/src/os/channel_defs.h
+++ b/src/nvim/os/channel_defs.h
diff --git a/src/os/env.c b/src/nvim/os/env.c
index e6cdb92ea8..e6cdb92ea8 100644
--- a/src/os/env.c
+++ b/src/nvim/os/env.c
diff --git a/src/os/event.c b/src/nvim/os/event.c
index 2c25852778..2c25852778 100644
--- a/src/os/event.c
+++ b/src/nvim/os/event.c
diff --git a/src/os/event.h b/src/nvim/os/event.h
index 5ddca46875..5ddca46875 100644
--- a/src/os/event.h
+++ b/src/nvim/os/event.h
diff --git a/src/os/event_defs.h b/src/nvim/os/event_defs.h
index 428ae50f3e..428ae50f3e 100644
--- a/src/os/event_defs.h
+++ b/src/nvim/os/event_defs.h
diff --git a/src/os/fs.c b/src/nvim/os/fs.c
index 89eb4c8691..89eb4c8691 100644
--- a/src/os/fs.c
+++ b/src/nvim/os/fs.c
diff --git a/src/os/input.c b/src/nvim/os/input.c
index 4310edd514..4310edd514 100644
--- a/src/os/input.c
+++ b/src/nvim/os/input.c
diff --git a/src/os/input.h b/src/nvim/os/input.h
index 9ffd50fd3f..9ffd50fd3f 100644
--- a/src/os/input.h
+++ b/src/nvim/os/input.h
diff --git a/src/os/job.c b/src/nvim/os/job.c
index 7940338b70..7940338b70 100644
--- a/src/os/job.c
+++ b/src/nvim/os/job.c
diff --git a/src/os/job.h b/src/nvim/os/job.h
index db147f2c24..db147f2c24 100644
--- a/src/os/job.h
+++ b/src/nvim/os/job.h
diff --git a/src/os/job_defs.h b/src/nvim/os/job_defs.h
index e98b639154..e98b639154 100644
--- a/src/os/job_defs.h
+++ b/src/nvim/os/job_defs.h
diff --git a/src/os/mem.c b/src/nvim/os/mem.c
index e5549340ff..e5549340ff 100644
--- a/src/os/mem.c
+++ b/src/nvim/os/mem.c
diff --git a/src/os/msgpack_rpc.c b/src/nvim/os/msgpack_rpc.c
index e429bf0519..e429bf0519 100644
--- a/src/os/msgpack_rpc.c
+++ b/src/nvim/os/msgpack_rpc.c
diff --git a/src/os/msgpack_rpc.h b/src/nvim/os/msgpack_rpc.h
index 7f754bfca1..7f754bfca1 100644
--- a/src/os/msgpack_rpc.h
+++ b/src/nvim/os/msgpack_rpc.h
diff --git a/src/os/os.h b/src/nvim/os/os.h
index b30872f06d..b30872f06d 100644
--- a/src/os/os.h
+++ b/src/nvim/os/os.h
diff --git a/src/os/rstream.c b/src/nvim/os/rstream.c
index e14075c8db..e14075c8db 100644
--- a/src/os/rstream.c
+++ b/src/nvim/os/rstream.c
diff --git a/src/os/rstream.h b/src/nvim/os/rstream.h
index 5eb3e97f55..5eb3e97f55 100644
--- a/src/os/rstream.h
+++ b/src/nvim/os/rstream.h
diff --git a/src/os/rstream_defs.h b/src/nvim/os/rstream_defs.h
index 3d1dbec34f..3d1dbec34f 100644
--- a/src/os/rstream_defs.h
+++ b/src/nvim/os/rstream_defs.h
diff --git a/src/os/server.c b/src/nvim/os/server.c
index bda9602936..bda9602936 100644
--- a/src/os/server.c
+++ b/src/nvim/os/server.c
diff --git a/src/os/server.h b/src/nvim/os/server.h
index b9459a81af..b9459a81af 100644
--- a/src/os/server.h
+++ b/src/nvim/os/server.h
diff --git a/src/os/server_defs.h b/src/nvim/os/server_defs.h
index cbaefe3949..cbaefe3949 100644
--- a/src/os/server_defs.h
+++ b/src/nvim/os/server_defs.h
diff --git a/src/os/shell.c b/src/nvim/os/shell.c
index d14e355d19..d14e355d19 100644
--- a/src/os/shell.c
+++ b/src/nvim/os/shell.c
diff --git a/src/os/shell.h b/src/nvim/os/shell.h
index 776c36d384..776c36d384 100644
--- a/src/os/shell.h
+++ b/src/nvim/os/shell.h
diff --git a/src/os/signal.c b/src/nvim/os/signal.c
index d3bedad09c..d3bedad09c 100644
--- a/src/os/signal.c
+++ b/src/nvim/os/signal.c
diff --git a/src/os/signal.h b/src/nvim/os/signal.h
index 79fdc8d79c..79fdc8d79c 100644
--- a/src/os/signal.h
+++ b/src/nvim/os/signal.h
diff --git a/src/os/time.c b/src/nvim/os/time.c
index 1dc7ca68d4..1dc7ca68d4 100644
--- a/src/os/time.c
+++ b/src/nvim/os/time.c
diff --git a/src/os/time.h b/src/nvim/os/time.h
index ef795d03be..ef795d03be 100644
--- a/src/os/time.h
+++ b/src/nvim/os/time.h
diff --git a/src/os/users.c b/src/nvim/os/users.c
index e7b362637b..e7b362637b 100644
--- a/src/os/users.c
+++ b/src/nvim/os/users.c
diff --git a/src/os/uv_helpers.c b/src/nvim/os/uv_helpers.c
index 62b021de5e..62b021de5e 100644
--- a/src/os/uv_helpers.c
+++ b/src/nvim/os/uv_helpers.c
diff --git a/src/os/uv_helpers.h b/src/nvim/os/uv_helpers.h
index 9d4cea30b2..9d4cea30b2 100644
--- a/src/os/uv_helpers.h
+++ b/src/nvim/os/uv_helpers.h
diff --git a/src/os/wstream.c b/src/nvim/os/wstream.c
index 0b289e80f5..0b289e80f5 100644
--- a/src/os/wstream.c
+++ b/src/nvim/os/wstream.c
diff --git a/src/os/wstream.h b/src/nvim/os/wstream.h
index 4a557ffd9f..4a557ffd9f 100644
--- a/src/os/wstream.h
+++ b/src/nvim/os/wstream.h
diff --git a/src/os/wstream_defs.h b/src/nvim/os/wstream_defs.h
index 59d57365fa..59d57365fa 100644
--- a/src/os/wstream_defs.h
+++ b/src/nvim/os/wstream_defs.h
diff --git a/src/os_unix.c b/src/nvim/os_unix.c
index 93cd0272a8..93cd0272a8 100644
--- a/src/os_unix.c
+++ b/src/nvim/os_unix.c
diff --git a/src/os_unix.h b/src/nvim/os_unix.h
index 9122ff81aa..9122ff81aa 100644
--- a/src/os_unix.h
+++ b/src/nvim/os_unix.h
diff --git a/src/os_unix_defs.h b/src/nvim/os_unix_defs.h
index 96fc7ff32e..96fc7ff32e 100644
--- a/src/os_unix_defs.h
+++ b/src/nvim/os_unix_defs.h
diff --git a/src/path.c b/src/nvim/path.c
index 541e1e1724..541e1e1724 100644
--- a/src/path.c
+++ b/src/nvim/path.c
diff --git a/src/path.h b/src/nvim/path.h
index 51503c3bdd..51503c3bdd 100644
--- a/src/path.h
+++ b/src/nvim/path.h
diff --git a/src/po/Makefile b/src/nvim/po/Makefile
index d702b9f277..d702b9f277 100644
--- a/src/po/Makefile
+++ b/src/nvim/po/Makefile
diff --git a/src/po/af.po b/src/nvim/po/af.po
index ab9e660602..ab9e660602 100644
--- a/src/po/af.po
+++ b/src/nvim/po/af.po
diff --git a/src/po/ca.po b/src/nvim/po/ca.po
index ef964cf5d7..ef964cf5d7 100644
--- a/src/po/ca.po
+++ b/src/nvim/po/ca.po
diff --git a/src/po/check.vim b/src/nvim/po/check.vim
index 5a3a0e3f46..5a3a0e3f46 100644
--- a/src/po/check.vim
+++ b/src/nvim/po/check.vim
diff --git a/src/po/cleanup.vim b/src/nvim/po/cleanup.vim
index 24ae74ed38..24ae74ed38 100644
--- a/src/po/cleanup.vim
+++ b/src/nvim/po/cleanup.vim
diff --git a/src/po/cs.cp1250.po b/src/nvim/po/cs.cp1250.po
index 44987c67cf..44987c67cf 100644
--- a/src/po/cs.cp1250.po
+++ b/src/nvim/po/cs.cp1250.po
diff --git a/src/po/cs.po b/src/nvim/po/cs.po
index 59fb598da6..59fb598da6 100644
--- a/src/po/cs.po
+++ b/src/nvim/po/cs.po
diff --git a/src/po/de.po b/src/nvim/po/de.po
index ac035509a6..ac035509a6 100644
--- a/src/po/de.po
+++ b/src/nvim/po/de.po
diff --git a/src/po/en_GB.po b/src/nvim/po/en_GB.po
index dc6fb82fcd..dc6fb82fcd 100644
--- a/src/po/en_GB.po
+++ b/src/nvim/po/en_GB.po
diff --git a/src/po/eo.po b/src/nvim/po/eo.po
index 63d7f288dd..63d7f288dd 100644
--- a/src/po/eo.po
+++ b/src/nvim/po/eo.po
diff --git a/src/po/es.po b/src/nvim/po/es.po
index d8ea0f099b..d8ea0f099b 100644
--- a/src/po/es.po
+++ b/src/nvim/po/es.po
diff --git a/src/po/fi.po b/src/nvim/po/fi.po
index 4dddffc49f..4dddffc49f 100644
--- a/src/po/fi.po
+++ b/src/nvim/po/fi.po
diff --git a/src/po/fr.po b/src/nvim/po/fr.po
index 28e9eb0af2..28e9eb0af2 100644
--- a/src/po/fr.po
+++ b/src/nvim/po/fr.po
diff --git a/src/po/ga.po b/src/nvim/po/ga.po
index 5e4df303a1..5e4df303a1 100644
--- a/src/po/ga.po
+++ b/src/nvim/po/ga.po
diff --git a/src/po/it.po b/src/nvim/po/it.po
index 6802b994c3..6802b994c3 100644
--- a/src/po/it.po
+++ b/src/nvim/po/it.po
diff --git a/src/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index affeb59927..affeb59927 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
diff --git a/src/po/ja.po b/src/nvim/po/ja.po
index 0b0d1e4aa1..0b0d1e4aa1 100644
--- a/src/po/ja.po
+++ b/src/nvim/po/ja.po
diff --git a/src/po/ja.sjis.po b/src/nvim/po/ja.sjis.po
index 0b13bbeddc..0b13bbeddc 100644
--- a/src/po/ja.sjis.po
+++ b/src/nvim/po/ja.sjis.po
diff --git a/src/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po
index 5858e73e6b..5858e73e6b 100644
--- a/src/po/ko.UTF-8.po
+++ b/src/nvim/po/ko.UTF-8.po
diff --git a/src/po/ko.po b/src/nvim/po/ko.po
index 8889297427..8889297427 100644
--- a/src/po/ko.po
+++ b/src/nvim/po/ko.po
diff --git a/src/po/nb.po b/src/nvim/po/nb.po
index ace954ca51..ace954ca51 100644
--- a/src/po/nb.po
+++ b/src/nvim/po/nb.po
diff --git a/src/po/nl.po b/src/nvim/po/nl.po
index 4a88f8cb72..4a88f8cb72 100644
--- a/src/po/nl.po
+++ b/src/nvim/po/nl.po
diff --git a/src/po/no.po b/src/nvim/po/no.po
index ace954ca51..ace954ca51 100644
--- a/src/po/no.po
+++ b/src/nvim/po/no.po
diff --git a/src/po/pl.UTF-8.po b/src/nvim/po/pl.UTF-8.po
index 77e396a0d8..77e396a0d8 100644
--- a/src/po/pl.UTF-8.po
+++ b/src/nvim/po/pl.UTF-8.po
diff --git a/src/po/pl.cp1250.po b/src/nvim/po/pl.cp1250.po
index 590785b7fb..590785b7fb 100644
--- a/src/po/pl.cp1250.po
+++ b/src/nvim/po/pl.cp1250.po
diff --git a/src/po/pl.po b/src/nvim/po/pl.po
index fb7806aa8e..fb7806aa8e 100644
--- a/src/po/pl.po
+++ b/src/nvim/po/pl.po
diff --git a/src/po/pt_BR.po b/src/nvim/po/pt_BR.po
index d9d0ecb05d..d9d0ecb05d 100644
--- a/src/po/pt_BR.po
+++ b/src/nvim/po/pt_BR.po
diff --git a/src/po/ru.cp1251.po b/src/nvim/po/ru.cp1251.po
index 09d30d6342..09d30d6342 100644
--- a/src/po/ru.cp1251.po
+++ b/src/nvim/po/ru.cp1251.po
diff --git a/src/po/ru.po b/src/nvim/po/ru.po
index 3ef46629cf..3ef46629cf 100644
--- a/src/po/ru.po
+++ b/src/nvim/po/ru.po
diff --git a/src/po/sjiscorr.c b/src/nvim/po/sjiscorr.c
index 6976ed8b9e..6976ed8b9e 100644
--- a/src/po/sjiscorr.c
+++ b/src/nvim/po/sjiscorr.c
diff --git a/src/po/sk.cp1250.po b/src/nvim/po/sk.cp1250.po
index 232d13eae3..232d13eae3 100644
--- a/src/po/sk.cp1250.po
+++ b/src/nvim/po/sk.cp1250.po
diff --git a/src/po/sk.po b/src/nvim/po/sk.po
index 5197947920..5197947920 100644
--- a/src/po/sk.po
+++ b/src/nvim/po/sk.po
diff --git a/src/po/sv.po b/src/nvim/po/sv.po
index 40f196c936..40f196c936 100644
--- a/src/po/sv.po
+++ b/src/nvim/po/sv.po
diff --git a/src/po/uk.cp1251.po b/src/nvim/po/uk.cp1251.po
index 3f8a7888bd..3f8a7888bd 100644
--- a/src/po/uk.cp1251.po
+++ b/src/nvim/po/uk.cp1251.po
diff --git a/src/po/uk.po b/src/nvim/po/uk.po
index cdb0c06ef2..cdb0c06ef2 100644
--- a/src/po/uk.po
+++ b/src/nvim/po/uk.po
diff --git a/src/po/vi.po b/src/nvim/po/vi.po
index 1db2d6b718..1db2d6b718 100644
--- a/src/po/vi.po
+++ b/src/nvim/po/vi.po
diff --git a/src/po/zh_CN.UTF-8.po b/src/nvim/po/zh_CN.UTF-8.po
index be6fb48e0b..be6fb48e0b 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/nvim/po/zh_CN.UTF-8.po
diff --git a/src/po/zh_CN.cp936.po b/src/nvim/po/zh_CN.cp936.po
index 75ba0a5b33..75ba0a5b33 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/nvim/po/zh_CN.cp936.po
diff --git a/src/po/zh_CN.po b/src/nvim/po/zh_CN.po
index 9362833a15..9362833a15 100644
--- a/src/po/zh_CN.po
+++ b/src/nvim/po/zh_CN.po
diff --git a/src/po/zh_TW.UTF-8.po b/src/nvim/po/zh_TW.UTF-8.po
index 8da2b10b09..8da2b10b09 100644
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/nvim/po/zh_TW.UTF-8.po
diff --git a/src/po/zh_TW.po b/src/nvim/po/zh_TW.po
index 0038ca6ea7..0038ca6ea7 100644
--- a/src/po/zh_TW.po
+++ b/src/nvim/po/zh_TW.po
diff --git a/src/popupmnu.c b/src/nvim/popupmnu.c
index b64f336d83..b64f336d83 100644
--- a/src/popupmnu.c
+++ b/src/nvim/popupmnu.c
diff --git a/src/popupmnu.h b/src/nvim/popupmnu.h
index bed355245a..bed355245a 100644
--- a/src/popupmnu.h
+++ b/src/nvim/popupmnu.h
diff --git a/src/pos.h b/src/nvim/pos.h
index df6e0e5c39..df6e0e5c39 100644
--- a/src/pos.h
+++ b/src/nvim/pos.h
diff --git a/src/proto.h b/src/nvim/proto.h
index 0177b52f28..0177b52f28 100644
--- a/src/proto.h
+++ b/src/nvim/proto.h
diff --git a/src/quickfix.c b/src/nvim/quickfix.c
index 94b2b05501..94b2b05501 100644
--- a/src/quickfix.c
+++ b/src/nvim/quickfix.c
diff --git a/src/quickfix.h b/src/nvim/quickfix.h
index ae53137ce8..ae53137ce8 100644
--- a/src/quickfix.h
+++ b/src/nvim/quickfix.h
diff --git a/src/regexp.c b/src/nvim/regexp.c
index 35d8e30129..35d8e30129 100644
--- a/src/regexp.c
+++ b/src/nvim/regexp.c
diff --git a/src/regexp.h b/src/nvim/regexp.h
index 8d4c921b37..8d4c921b37 100644
--- a/src/regexp.h
+++ b/src/nvim/regexp.h
diff --git a/src/regexp_defs.h b/src/nvim/regexp_defs.h
index 5bed390636..5bed390636 100644
--- a/src/regexp_defs.h
+++ b/src/nvim/regexp_defs.h
diff --git a/src/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 0cd374d91f..0cd374d91f 100644
--- a/src/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
diff --git a/src/screen.c b/src/nvim/screen.c
index aa021c032e..aa021c032e 100644
--- a/src/screen.c
+++ b/src/nvim/screen.c
diff --git a/src/screen.h b/src/nvim/screen.h
index 9ac6174d18..9ac6174d18 100644
--- a/src/screen.h
+++ b/src/nvim/screen.h
diff --git a/src/search.c b/src/nvim/search.c
index 891db71549..891db71549 100644
--- a/src/search.c
+++ b/src/nvim/search.c
diff --git a/src/search.h b/src/nvim/search.h
index d0137dcd78..d0137dcd78 100644
--- a/src/search.h
+++ b/src/nvim/search.h
diff --git a/src/sha256.c b/src/nvim/sha256.c
index 0ccb13d763..0ccb13d763 100644
--- a/src/sha256.c
+++ b/src/nvim/sha256.c
diff --git a/src/sha256.h b/src/nvim/sha256.h
index b8d6bf5c76..b8d6bf5c76 100644
--- a/src/sha256.h
+++ b/src/nvim/sha256.h
diff --git a/src/sign_defs.h b/src/nvim/sign_defs.h
index be33a57fff..be33a57fff 100644
--- a/src/sign_defs.h
+++ b/src/nvim/sign_defs.h
diff --git a/src/spell.c b/src/nvim/spell.c
index 5392fe4a70..5392fe4a70 100644
--- a/src/spell.c
+++ b/src/nvim/spell.c
diff --git a/src/spell.h b/src/nvim/spell.h
index 9662c8e6f2..9662c8e6f2 100644
--- a/src/spell.h
+++ b/src/nvim/spell.h
diff --git a/src/strings.c b/src/nvim/strings.c
index 72a1f11460..72a1f11460 100644
--- a/src/strings.c
+++ b/src/nvim/strings.c
diff --git a/src/strings.h b/src/nvim/strings.h
index 2a4fd19fb9..2a4fd19fb9 100644
--- a/src/strings.h
+++ b/src/nvim/strings.h
diff --git a/src/syntax.c b/src/nvim/syntax.c
index 41128868fc..41128868fc 100644
--- a/src/syntax.c
+++ b/src/nvim/syntax.c
diff --git a/src/syntax.h b/src/nvim/syntax.h
index f3e7e87c7b..f3e7e87c7b 100644
--- a/src/syntax.h
+++ b/src/nvim/syntax.h
diff --git a/src/syntax_defs.h b/src/nvim/syntax_defs.h
index aed2913f81..aed2913f81 100644
--- a/src/syntax_defs.h
+++ b/src/nvim/syntax_defs.h
diff --git a/src/tag.c b/src/nvim/tag.c
index bfef5366d9..bfef5366d9 100644
--- a/src/tag.c
+++ b/src/nvim/tag.c
diff --git a/src/tag.h b/src/nvim/tag.h
index a5e1b4d491..a5e1b4d491 100644
--- a/src/tag.h
+++ b/src/nvim/tag.h
diff --git a/src/term.c b/src/nvim/term.c
index 61dc6f4631..61dc6f4631 100644
--- a/src/term.c
+++ b/src/nvim/term.c
diff --git a/src/term.h b/src/nvim/term.h
index 547b729e6e..547b729e6e 100644
--- a/src/term.h
+++ b/src/nvim/term.h
diff --git a/src/term_defs.h b/src/nvim/term_defs.h
index ed341adc8e..ed341adc8e 100644
--- a/src/term_defs.h
+++ b/src/nvim/term_defs.h
diff --git a/src/testdir/Makefile b/src/nvim/testdir/Makefile
index f720d7a2b4..f720d7a2b4 100644
--- a/src/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
diff --git a/src/testdir/dotest.in b/src/nvim/testdir/dotest.in
index b2a0e1a68e..b2a0e1a68e 100644
--- a/src/testdir/dotest.in
+++ b/src/nvim/testdir/dotest.in
diff --git a/src/testdir/sautest/autoload/Test104.vim b/src/nvim/testdir/sautest/autoload/Test104.vim
index d1e0e17a3b..d1e0e17a3b 100644
--- a/src/testdir/sautest/autoload/Test104.vim
+++ b/src/nvim/testdir/sautest/autoload/Test104.vim
diff --git a/src/testdir/sautest/autoload/footest.vim b/src/nvim/testdir/sautest/autoload/footest.vim
index f467bc376d..f467bc376d 100644
--- a/src/testdir/sautest/autoload/footest.vim
+++ b/src/nvim/testdir/sautest/autoload/footest.vim
diff --git a/src/testdir/test1.in b/src/nvim/testdir/test1.in
index 735d539673..735d539673 100644
--- a/src/testdir/test1.in
+++ b/src/nvim/testdir/test1.in
diff --git a/src/testdir/test1.ok b/src/nvim/testdir/test1.ok
index 90bfcb5106..90bfcb5106 100644
--- a/src/testdir/test1.ok
+++ b/src/nvim/testdir/test1.ok
diff --git a/src/testdir/test10.in b/src/nvim/testdir/test10.in
index 2d0d546606..2d0d546606 100644
--- a/src/testdir/test10.in
+++ b/src/nvim/testdir/test10.in
diff --git a/src/testdir/test10.ok b/src/nvim/testdir/test10.ok
index 76a02f40b4..76a02f40b4 100644
--- a/src/testdir/test10.ok
+++ b/src/nvim/testdir/test10.ok
diff --git a/src/testdir/test100.in b/src/nvim/testdir/test100.in
index e42331946c..e42331946c 100644
--- a/src/testdir/test100.in
+++ b/src/nvim/testdir/test100.in
diff --git a/src/testdir/test100.ok b/src/nvim/testdir/test100.ok
index 95b318461c..95b318461c 100644
--- a/src/testdir/test100.ok
+++ b/src/nvim/testdir/test100.ok
diff --git a/src/testdir/test101.in b/src/nvim/testdir/test101.in
index 04c934f2c5..04c934f2c5 100644
--- a/src/testdir/test101.in
+++ b/src/nvim/testdir/test101.in
diff --git a/src/testdir/test101.ok b/src/nvim/testdir/test101.ok
index 3ed7436cf7..3ed7436cf7 100644
--- a/src/testdir/test101.ok
+++ b/src/nvim/testdir/test101.ok
diff --git a/src/testdir/test102.in b/src/nvim/testdir/test102.in
index 35e9f6c2cf..35e9f6c2cf 100644
--- a/src/testdir/test102.in
+++ b/src/nvim/testdir/test102.in
diff --git a/src/testdir/test102.ok b/src/nvim/testdir/test102.ok
index a25fea192c..a25fea192c 100644
--- a/src/testdir/test102.ok
+++ b/src/nvim/testdir/test102.ok
diff --git a/src/testdir/test103.in b/src/nvim/testdir/test103.in
index 7c7591e3b9..7c7591e3b9 100644
--- a/src/testdir/test103.in
+++ b/src/nvim/testdir/test103.in
diff --git a/src/testdir/test103.ok b/src/nvim/testdir/test103.ok
index 9ea6dd6eea..9ea6dd6eea 100644
--- a/src/testdir/test103.ok
+++ b/src/nvim/testdir/test103.ok
diff --git a/src/testdir/test104.in b/src/nvim/testdir/test104.in
index fd847131e9..fd847131e9 100644
--- a/src/testdir/test104.in
+++ b/src/nvim/testdir/test104.in
diff --git a/src/testdir/test104.ok b/src/nvim/testdir/test104.ok
index 5fb20945c3..5fb20945c3 100644
--- a/src/testdir/test104.ok
+++ b/src/nvim/testdir/test104.ok
diff --git a/src/testdir/test105.in b/src/nvim/testdir/test105.in
index 284f3bf4eb..284f3bf4eb 100644
--- a/src/testdir/test105.in
+++ b/src/nvim/testdir/test105.in
diff --git a/src/testdir/test105.ok b/src/nvim/testdir/test105.ok
index 0681597c05..0681597c05 100644
--- a/src/testdir/test105.ok
+++ b/src/nvim/testdir/test105.ok
diff --git a/src/testdir/test106.in b/src/nvim/testdir/test106.in
index eb99e650ae..eb99e650ae 100644
--- a/src/testdir/test106.in
+++ b/src/nvim/testdir/test106.in
diff --git a/src/testdir/test106.ok b/src/nvim/testdir/test106.ok
index 0a18cecf1c..0a18cecf1c 100644
--- a/src/testdir/test106.ok
+++ b/src/nvim/testdir/test106.ok
diff --git a/src/testdir/test10a.in b/src/nvim/testdir/test10a.in
index 19e8652fe5..19e8652fe5 100644
--- a/src/testdir/test10a.in
+++ b/src/nvim/testdir/test10a.in
diff --git a/src/testdir/test10a.ok b/src/nvim/testdir/test10a.ok
index 10e78c9239..10e78c9239 100644
--- a/src/testdir/test10a.ok
+++ b/src/nvim/testdir/test10a.ok
diff --git a/src/testdir/test11.in b/src/nvim/testdir/test11.in
index 47de470a2d..47de470a2d 100644
--- a/src/testdir/test11.in
+++ b/src/nvim/testdir/test11.in
diff --git a/src/testdir/test11.ok b/src/nvim/testdir/test11.ok
index af8c5ce261..af8c5ce261 100644
--- a/src/testdir/test11.ok
+++ b/src/nvim/testdir/test11.ok
diff --git a/src/testdir/test12.in b/src/nvim/testdir/test12.in
index 46e9c45b80..46e9c45b80 100644
--- a/src/testdir/test12.in
+++ b/src/nvim/testdir/test12.in
diff --git a/src/testdir/test12.ok b/src/nvim/testdir/test12.ok
index 605623b117..605623b117 100644
--- a/src/testdir/test12.ok
+++ b/src/nvim/testdir/test12.ok
diff --git a/src/testdir/test13.in b/src/nvim/testdir/test13.in
index cb8a6fff89..cb8a6fff89 100644
--- a/src/testdir/test13.in
+++ b/src/nvim/testdir/test13.in
diff --git a/src/testdir/test13.ok b/src/nvim/testdir/test13.ok
index 0f1fc347a4..0f1fc347a4 100644
--- a/src/testdir/test13.ok
+++ b/src/nvim/testdir/test13.ok
diff --git a/src/testdir/test14.in b/src/nvim/testdir/test14.in
index fb987ebc88..fb987ebc88 100644
--- a/src/testdir/test14.in
+++ b/src/nvim/testdir/test14.in
diff --git a/src/testdir/test14.ok b/src/nvim/testdir/test14.ok
index 0aa2db3f97..0aa2db3f97 100644
--- a/src/testdir/test14.ok
+++ b/src/nvim/testdir/test14.ok
diff --git a/src/testdir/test15.in b/src/nvim/testdir/test15.in
index 366529a550..366529a550 100644
--- a/src/testdir/test15.in
+++ b/src/nvim/testdir/test15.in
diff --git a/src/testdir/test15.ok b/src/nvim/testdir/test15.ok
index bc09f5e7db..bc09f5e7db 100644
--- a/src/testdir/test15.ok
+++ b/src/nvim/testdir/test15.ok
diff --git a/src/testdir/test16.in b/src/nvim/testdir/test16.in
index b2cd159a8c..b2cd159a8c 100644
--- a/src/testdir/test16.in
+++ b/src/nvim/testdir/test16.in
diff --git a/src/testdir/test16.ok b/src/nvim/testdir/test16.ok
index 25e2eea5c0..25e2eea5c0 100644
--- a/src/testdir/test16.ok
+++ b/src/nvim/testdir/test16.ok
diff --git a/src/testdir/test17.in b/src/nvim/testdir/test17.in
index bc542c7625..bc542c7625 100644
--- a/src/testdir/test17.in
+++ b/src/nvim/testdir/test17.in
diff --git a/src/testdir/test17.ok b/src/nvim/testdir/test17.ok
index b2a66d5f85..b2a66d5f85 100644
--- a/src/testdir/test17.ok
+++ b/src/nvim/testdir/test17.ok
diff --git a/src/testdir/test17a.in b/src/nvim/testdir/test17a.in
index 7e89364797..7e89364797 100644
--- a/src/testdir/test17a.in
+++ b/src/nvim/testdir/test17a.in
diff --git a/src/testdir/test18.in b/src/nvim/testdir/test18.in
index 9bfd922344..9bfd922344 100644
--- a/src/testdir/test18.in
+++ b/src/nvim/testdir/test18.in
diff --git a/src/testdir/test18.ok b/src/nvim/testdir/test18.ok
index e719713785..e719713785 100644
--- a/src/testdir/test18.ok
+++ b/src/nvim/testdir/test18.ok
diff --git a/src/testdir/test19.in b/src/nvim/testdir/test19.in
index aafa34e521..aafa34e521 100644
--- a/src/testdir/test19.in
+++ b/src/nvim/testdir/test19.in
diff --git a/src/testdir/test19.ok b/src/nvim/testdir/test19.ok
index 4146214919..4146214919 100644
--- a/src/testdir/test19.ok
+++ b/src/nvim/testdir/test19.ok
diff --git a/src/testdir/test2.in b/src/nvim/testdir/test2.in
index b7b5a51066..b7b5a51066 100644
--- a/src/testdir/test2.in
+++ b/src/nvim/testdir/test2.in
diff --git a/src/testdir/test2.ok b/src/nvim/testdir/test2.ok
index 32978825f8..32978825f8 100644
--- a/src/testdir/test2.ok
+++ b/src/nvim/testdir/test2.ok
diff --git a/src/testdir/test20.in b/src/nvim/testdir/test20.in
index 662a1439f2..662a1439f2 100644
--- a/src/testdir/test20.in
+++ b/src/nvim/testdir/test20.in
diff --git a/src/testdir/test20.ok b/src/nvim/testdir/test20.ok
index 7c50ea8db8..7c50ea8db8 100644
--- a/src/testdir/test20.ok
+++ b/src/nvim/testdir/test20.ok
diff --git a/src/testdir/test21.in b/src/nvim/testdir/test21.in
index 491b9f7404..491b9f7404 100644
--- a/src/testdir/test21.in
+++ b/src/nvim/testdir/test21.in
diff --git a/src/testdir/test21.ok b/src/nvim/testdir/test21.ok
index d9f1b759ce..d9f1b759ce 100644
--- a/src/testdir/test21.ok
+++ b/src/nvim/testdir/test21.ok
diff --git a/src/testdir/test22.in b/src/nvim/testdir/test22.in
index f5cc046c6a..f5cc046c6a 100644
--- a/src/testdir/test22.in
+++ b/src/nvim/testdir/test22.in
diff --git a/src/testdir/test22.ok b/src/nvim/testdir/test22.ok
index 38ff89eaf3..38ff89eaf3 100644
--- a/src/testdir/test22.ok
+++ b/src/nvim/testdir/test22.ok
diff --git a/src/testdir/test23.in b/src/nvim/testdir/test23.in
index 0e0e605531..0e0e605531 100644
--- a/src/testdir/test23.in
+++ b/src/nvim/testdir/test23.in
diff --git a/src/testdir/test23.ok b/src/nvim/testdir/test23.ok
index f1930abad6..f1930abad6 100644
--- a/src/testdir/test23.ok
+++ b/src/nvim/testdir/test23.ok
diff --git a/src/testdir/test24.in b/src/nvim/testdir/test24.in
index 7dfc1afdc6..7dfc1afdc6 100644
--- a/src/testdir/test24.in
+++ b/src/nvim/testdir/test24.in
diff --git a/src/testdir/test24.ok b/src/nvim/testdir/test24.ok
index cd61210968..cd61210968 100644
--- a/src/testdir/test24.ok
+++ b/src/nvim/testdir/test24.ok
diff --git a/src/testdir/test25.in b/src/nvim/testdir/test25.in
index 4139865daf..4139865daf 100644
--- a/src/testdir/test25.in
+++ b/src/nvim/testdir/test25.in
diff --git a/src/testdir/test25.ok b/src/nvim/testdir/test25.ok
index 08fc070b7b..08fc070b7b 100644
--- a/src/testdir/test25.ok
+++ b/src/nvim/testdir/test25.ok
diff --git a/src/testdir/test26.in b/src/nvim/testdir/test26.in
index e7cd757661..e7cd757661 100644
--- a/src/testdir/test26.in
+++ b/src/nvim/testdir/test26.in
diff --git a/src/testdir/test26.ok b/src/nvim/testdir/test26.ok
index bc44761187..bc44761187 100644
--- a/src/testdir/test26.ok
+++ b/src/nvim/testdir/test26.ok
diff --git a/src/testdir/test27.in b/src/nvim/testdir/test27.in
index 2df16d9eff..2df16d9eff 100644
--- a/src/testdir/test27.in
+++ b/src/nvim/testdir/test27.in
diff --git a/src/testdir/test27.ok b/src/nvim/testdir/test27.ok
index c35f2438a9..c35f2438a9 100644
--- a/src/testdir/test27.ok
+++ b/src/nvim/testdir/test27.ok
diff --git a/src/testdir/test28.in b/src/nvim/testdir/test28.in
index 5542c92666..5542c92666 100644
--- a/src/testdir/test28.in
+++ b/src/nvim/testdir/test28.in
diff --git a/src/testdir/test28.ok b/src/nvim/testdir/test28.ok
index 911d854655..911d854655 100644
--- a/src/testdir/test28.ok
+++ b/src/nvim/testdir/test28.ok
diff --git a/src/testdir/test29.in b/src/nvim/testdir/test29.in
index 1d6cb6f4d1..1d6cb6f4d1 100644
--- a/src/testdir/test29.in
+++ b/src/nvim/testdir/test29.in
diff --git a/src/testdir/test29.ok b/src/nvim/testdir/test29.ok
index 9dc07ed46b..9dc07ed46b 100644
--- a/src/testdir/test29.ok
+++ b/src/nvim/testdir/test29.ok
diff --git a/src/testdir/test3.in b/src/nvim/testdir/test3.in
index a7543945c4..a7543945c4 100644
--- a/src/testdir/test3.in
+++ b/src/nvim/testdir/test3.in
diff --git a/src/testdir/test3.ok b/src/nvim/testdir/test3.ok
index d73a5e1230..d73a5e1230 100644
--- a/src/testdir/test3.ok
+++ b/src/nvim/testdir/test3.ok
diff --git a/src/testdir/test30.in b/src/nvim/testdir/test30.in
index 4a8778d2de..4a8778d2de 100644
--- a/src/testdir/test30.in
+++ b/src/nvim/testdir/test30.in
diff --git a/src/testdir/test30.ok b/src/nvim/testdir/test30.ok
index 380ce67061..380ce67061 100644
--- a/src/testdir/test30.ok
+++ b/src/nvim/testdir/test30.ok
diff --git a/src/testdir/test31.in b/src/nvim/testdir/test31.in
index 7dc2334781..7dc2334781 100644
--- a/src/testdir/test31.in
+++ b/src/nvim/testdir/test31.in
diff --git a/src/testdir/test31.ok b/src/nvim/testdir/test31.ok
index 185bdc768e..185bdc768e 100644
--- a/src/testdir/test31.ok
+++ b/src/nvim/testdir/test31.ok
diff --git a/src/testdir/test32.in b/src/nvim/testdir/test32.in
index 6b399fa6c6..6b399fa6c6 100644
--- a/src/testdir/test32.in
+++ b/src/nvim/testdir/test32.in
diff --git a/src/testdir/test32.ok b/src/nvim/testdir/test32.ok
index afc4463fac..afc4463fac 100644
--- a/src/testdir/test32.ok
+++ b/src/nvim/testdir/test32.ok
diff --git a/src/testdir/test33.in b/src/nvim/testdir/test33.in
index 5644760402..5644760402 100644
--- a/src/testdir/test33.in
+++ b/src/nvim/testdir/test33.in
diff --git a/src/testdir/test33.ok b/src/nvim/testdir/test33.ok
index cd1d87a14b..cd1d87a14b 100644
--- a/src/testdir/test33.ok
+++ b/src/nvim/testdir/test33.ok
diff --git a/src/testdir/test34.in b/src/nvim/testdir/test34.in
index 71ee5f63b2..71ee5f63b2 100644
--- a/src/testdir/test34.in
+++ b/src/nvim/testdir/test34.in
diff --git a/src/testdir/test34.ok b/src/nvim/testdir/test34.ok
index 97995de80e..97995de80e 100644
--- a/src/testdir/test34.ok
+++ b/src/nvim/testdir/test34.ok
diff --git a/src/testdir/test35.in b/src/nvim/testdir/test35.in
index ba97911a1d..ba97911a1d 100644
--- a/src/testdir/test35.in
+++ b/src/nvim/testdir/test35.in
diff --git a/src/testdir/test35.ok b/src/nvim/testdir/test35.ok
index 093ad958ac..093ad958ac 100644
--- a/src/testdir/test35.ok
+++ b/src/nvim/testdir/test35.ok
diff --git a/src/testdir/test36.in b/src/nvim/testdir/test36.in
index 8cdb5262bd..8cdb5262bd 100644
--- a/src/testdir/test36.in
+++ b/src/nvim/testdir/test36.in
diff --git a/src/testdir/test36.ok b/src/nvim/testdir/test36.ok
index f72a74b2b7..f72a74b2b7 100644
--- a/src/testdir/test36.ok
+++ b/src/nvim/testdir/test36.ok
diff --git a/src/testdir/test37.in b/src/nvim/testdir/test37.in
index 8ca1125793..8ca1125793 100644
--- a/src/testdir/test37.in
+++ b/src/nvim/testdir/test37.in
diff --git a/src/testdir/test37.ok b/src/nvim/testdir/test37.ok
index d0b74853b3..d0b74853b3 100644
--- a/src/testdir/test37.ok
+++ b/src/nvim/testdir/test37.ok
diff --git a/src/testdir/test38.in b/src/nvim/testdir/test38.in
index 3e0236251b..3e0236251b 100644
--- a/src/testdir/test38.in
+++ b/src/nvim/testdir/test38.in
diff --git a/src/testdir/test38.ok b/src/nvim/testdir/test38.ok
index e10209667b..e10209667b 100644
--- a/src/testdir/test38.ok
+++ b/src/nvim/testdir/test38.ok
diff --git a/src/testdir/test39.in b/src/nvim/testdir/test39.in
index c1e1cc49a6..c1e1cc49a6 100644
--- a/src/testdir/test39.in
+++ b/src/nvim/testdir/test39.in
diff --git a/src/testdir/test39.ok b/src/nvim/testdir/test39.ok
index ef7a2c6442..ef7a2c6442 100644
--- a/src/testdir/test39.ok
+++ b/src/nvim/testdir/test39.ok
diff --git a/src/testdir/test4.in b/src/nvim/testdir/test4.in
index 4aa2fe5a86..4aa2fe5a86 100644
--- a/src/testdir/test4.in
+++ b/src/nvim/testdir/test4.in
diff --git a/src/testdir/test4.ok b/src/nvim/testdir/test4.ok
index dffecda4d2..dffecda4d2 100644
--- a/src/testdir/test4.ok
+++ b/src/nvim/testdir/test4.ok
diff --git a/src/testdir/test40.in b/src/nvim/testdir/test40.in
index d92a18f3d0..d92a18f3d0 100644
--- a/src/testdir/test40.in
+++ b/src/nvim/testdir/test40.in
diff --git a/src/testdir/test40.ok b/src/nvim/testdir/test40.ok
index b6501394f9..b6501394f9 100644
--- a/src/testdir/test40.ok
+++ b/src/nvim/testdir/test40.ok
diff --git a/src/testdir/test41.in b/src/nvim/testdir/test41.in
index 2d294cae09..2d294cae09 100644
--- a/src/testdir/test41.in
+++ b/src/nvim/testdir/test41.in
diff --git a/src/testdir/test41.ok b/src/nvim/testdir/test41.ok
index 988e5f24b4..988e5f24b4 100644
--- a/src/testdir/test41.ok
+++ b/src/nvim/testdir/test41.ok
diff --git a/src/testdir/test42.in b/src/nvim/testdir/test42.in
index c35569a76c..c35569a76c 100644
--- a/src/testdir/test42.in
+++ b/src/nvim/testdir/test42.in
diff --git a/src/testdir/test42.ok b/src/nvim/testdir/test42.ok
index 183430d71c..183430d71c 100644
--- a/src/testdir/test42.ok
+++ b/src/nvim/testdir/test42.ok
diff --git a/src/testdir/test43.in b/src/nvim/testdir/test43.in
index 7c545073da..7c545073da 100644
--- a/src/testdir/test43.in
+++ b/src/nvim/testdir/test43.in
diff --git a/src/testdir/test43.ok b/src/nvim/testdir/test43.ok
index 0b37a6a61e..0b37a6a61e 100644
--- a/src/testdir/test43.ok
+++ b/src/nvim/testdir/test43.ok
diff --git a/src/testdir/test44.in b/src/nvim/testdir/test44.in
index 87de1b95a4..87de1b95a4 100644
--- a/src/testdir/test44.in
+++ b/src/nvim/testdir/test44.in
diff --git a/src/testdir/test44.ok b/src/nvim/testdir/test44.ok
index 0bd0b8ab73..0bd0b8ab73 100644
--- a/src/testdir/test44.ok
+++ b/src/nvim/testdir/test44.ok
diff --git a/src/testdir/test45.in b/src/nvim/testdir/test45.in
index e5af5073d9..e5af5073d9 100644
--- a/src/testdir/test45.in
+++ b/src/nvim/testdir/test45.in
diff --git a/src/testdir/test45.ok b/src/nvim/testdir/test45.ok
index f04996e337..f04996e337 100644
--- a/src/testdir/test45.ok
+++ b/src/nvim/testdir/test45.ok
diff --git a/src/testdir/test46.in b/src/nvim/testdir/test46.in
index 9a9db74d62..9a9db74d62 100644
--- a/src/testdir/test46.in
+++ b/src/nvim/testdir/test46.in
diff --git a/src/testdir/test46.ok b/src/nvim/testdir/test46.ok
index 71b353df1d..71b353df1d 100644
--- a/src/testdir/test46.ok
+++ b/src/nvim/testdir/test46.ok
diff --git a/src/testdir/test47.in b/src/nvim/testdir/test47.in
index 13ad82462f..13ad82462f 100644
--- a/src/testdir/test47.in
+++ b/src/nvim/testdir/test47.in
diff --git a/src/testdir/test47.ok b/src/nvim/testdir/test47.ok
index b1cba92b1c..b1cba92b1c 100644
--- a/src/testdir/test47.ok
+++ b/src/nvim/testdir/test47.ok
diff --git a/src/testdir/test48.in b/src/nvim/testdir/test48.in
index 48f4abbf75..48f4abbf75 100644
--- a/src/testdir/test48.in
+++ b/src/nvim/testdir/test48.in
diff --git a/src/testdir/test48.ok b/src/nvim/testdir/test48.ok
index 334cb5a29c..334cb5a29c 100644
--- a/src/testdir/test48.ok
+++ b/src/nvim/testdir/test48.ok
diff --git a/src/testdir/test49.in b/src/nvim/testdir/test49.in
index bd6cb4cad7..bd6cb4cad7 100644
--- a/src/testdir/test49.in
+++ b/src/nvim/testdir/test49.in
diff --git a/src/testdir/test49.ok b/src/nvim/testdir/test49.ok
index bf1ceed9af..bf1ceed9af 100644
--- a/src/testdir/test49.ok
+++ b/src/nvim/testdir/test49.ok
diff --git a/src/testdir/test49.vim b/src/nvim/testdir/test49.vim
index 21c2a0c582..21c2a0c582 100644
--- a/src/testdir/test49.vim
+++ b/src/nvim/testdir/test49.vim
diff --git a/src/testdir/test5.in b/src/nvim/testdir/test5.in
index e19e20d59b..e19e20d59b 100644
--- a/src/testdir/test5.in
+++ b/src/nvim/testdir/test5.in
diff --git a/src/testdir/test5.ok b/src/nvim/testdir/test5.ok
index 6743060794..6743060794 100644
--- a/src/testdir/test5.ok
+++ b/src/nvim/testdir/test5.ok
diff --git a/src/testdir/test50.in b/src/nvim/testdir/test50.in
index 0cbf4bf6d6..0cbf4bf6d6 100644
--- a/src/testdir/test50.in
+++ b/src/nvim/testdir/test50.in
diff --git a/src/testdir/test50.ok b/src/nvim/testdir/test50.ok
index 91ef1d6604..91ef1d6604 100644
--- a/src/testdir/test50.ok
+++ b/src/nvim/testdir/test50.ok
diff --git a/src/testdir/test51.in b/src/nvim/testdir/test51.in
index b4f45d1f75..b4f45d1f75 100644
--- a/src/testdir/test51.in
+++ b/src/nvim/testdir/test51.in
diff --git a/src/testdir/test51.ok b/src/nvim/testdir/test51.ok
index be9ff7862c..be9ff7862c 100644
--- a/src/testdir/test51.ok
+++ b/src/nvim/testdir/test51.ok
diff --git a/src/testdir/test52.in b/src/nvim/testdir/test52.in
index 206b65a1f9..206b65a1f9 100644
--- a/src/testdir/test52.in
+++ b/src/nvim/testdir/test52.in
diff --git a/src/testdir/test52.ok b/src/nvim/testdir/test52.ok
index 90b516508d..90b516508d 100644
--- a/src/testdir/test52.ok
+++ b/src/nvim/testdir/test52.ok
diff --git a/src/testdir/test53.in b/src/nvim/testdir/test53.in
index 011c9ae39d..011c9ae39d 100644
--- a/src/testdir/test53.in
+++ b/src/nvim/testdir/test53.in
diff --git a/src/testdir/test53.ok b/src/nvim/testdir/test53.ok
index d7ffa6bc51..d7ffa6bc51 100644
--- a/src/testdir/test53.ok
+++ b/src/nvim/testdir/test53.ok
diff --git a/src/testdir/test54.in b/src/nvim/testdir/test54.in
index 9fc6537e08..9fc6537e08 100644
--- a/src/testdir/test54.in
+++ b/src/nvim/testdir/test54.in
diff --git a/src/testdir/test54.ok b/src/nvim/testdir/test54.ok
index 0fd1dc915b..0fd1dc915b 100644
--- a/src/testdir/test54.ok
+++ b/src/nvim/testdir/test54.ok
diff --git a/src/testdir/test55.in b/src/nvim/testdir/test55.in
index 85a8063774..85a8063774 100644
--- a/src/testdir/test55.in
+++ b/src/nvim/testdir/test55.in
diff --git a/src/testdir/test55.ok b/src/nvim/testdir/test55.ok
index be476e8e93..be476e8e93 100644
--- a/src/testdir/test55.ok
+++ b/src/nvim/testdir/test55.ok
diff --git a/src/testdir/test56.in b/src/nvim/testdir/test56.in
index 311a6004ca..311a6004ca 100644
--- a/src/testdir/test56.in
+++ b/src/nvim/testdir/test56.in
diff --git a/src/testdir/test56.ok b/src/nvim/testdir/test56.ok
index f2b0d33c8b..f2b0d33c8b 100644
--- a/src/testdir/test56.ok
+++ b/src/nvim/testdir/test56.ok
diff --git a/src/testdir/test57.in b/src/nvim/testdir/test57.in
index 8d972e4a68..8d972e4a68 100644
--- a/src/testdir/test57.in
+++ b/src/nvim/testdir/test57.in
diff --git a/src/testdir/test57.ok b/src/nvim/testdir/test57.ok
index aa3d373183..aa3d373183 100644
--- a/src/testdir/test57.ok
+++ b/src/nvim/testdir/test57.ok
diff --git a/src/testdir/test58.in b/src/nvim/testdir/test58.in
index cef1cfa1ba..cef1cfa1ba 100644
--- a/src/testdir/test58.in
+++ b/src/nvim/testdir/test58.in
diff --git a/src/testdir/test58.ok b/src/nvim/testdir/test58.ok
index ce05c73322..ce05c73322 100644
--- a/src/testdir/test58.ok
+++ b/src/nvim/testdir/test58.ok
diff --git a/src/testdir/test59.in b/src/nvim/testdir/test59.in
index dcdb62b283..dcdb62b283 100644
--- a/src/testdir/test59.in
+++ b/src/nvim/testdir/test59.in
diff --git a/src/testdir/test59.ok b/src/nvim/testdir/test59.ok
index 931cdd9654..931cdd9654 100644
--- a/src/testdir/test59.ok
+++ b/src/nvim/testdir/test59.ok
diff --git a/src/testdir/test6.in b/src/nvim/testdir/test6.in
index 1ebbe2fa51..1ebbe2fa51 100644
--- a/src/testdir/test6.in
+++ b/src/nvim/testdir/test6.in
diff --git a/src/testdir/test6.ok b/src/nvim/testdir/test6.ok
index b6b0c93e4e..b6b0c93e4e 100644
--- a/src/testdir/test6.ok
+++ b/src/nvim/testdir/test6.ok
diff --git a/src/testdir/test60.in b/src/nvim/testdir/test60.in
index 8835df9e0c..8835df9e0c 100644
--- a/src/testdir/test60.in
+++ b/src/nvim/testdir/test60.in
diff --git a/src/testdir/test60.ok b/src/nvim/testdir/test60.ok
index dabcd0c05d..dabcd0c05d 100644
--- a/src/testdir/test60.ok
+++ b/src/nvim/testdir/test60.ok
diff --git a/src/testdir/test60.vim b/src/nvim/testdir/test60.vim
index f1157f73f9..f1157f73f9 100644
--- a/src/testdir/test60.vim
+++ b/src/nvim/testdir/test60.vim
diff --git a/src/testdir/test61.in b/src/nvim/testdir/test61.in
index dc24ab9804..dc24ab9804 100644
--- a/src/testdir/test61.in
+++ b/src/nvim/testdir/test61.in
diff --git a/src/testdir/test61.ok b/src/nvim/testdir/test61.ok
index ea4b473ad7..ea4b473ad7 100644
--- a/src/testdir/test61.ok
+++ b/src/nvim/testdir/test61.ok
diff --git a/src/testdir/test62.in b/src/nvim/testdir/test62.in
index 93d968b33e..93d968b33e 100644
--- a/src/testdir/test62.in
+++ b/src/nvim/testdir/test62.in
diff --git a/src/testdir/test62.ok b/src/nvim/testdir/test62.ok
index e35b2b1c67..e35b2b1c67 100644
--- a/src/testdir/test62.ok
+++ b/src/nvim/testdir/test62.ok
diff --git a/src/testdir/test63.in b/src/nvim/testdir/test63.in
index 74339c3e35..74339c3e35 100644
--- a/src/testdir/test63.in
+++ b/src/nvim/testdir/test63.in
diff --git a/src/testdir/test63.ok b/src/nvim/testdir/test63.ok
index 14973985eb..14973985eb 100644
--- a/src/testdir/test63.ok
+++ b/src/nvim/testdir/test63.ok
diff --git a/src/testdir/test64.in b/src/nvim/testdir/test64.in
index 29bf0b902b..29bf0b902b 100644
--- a/src/testdir/test64.in
+++ b/src/nvim/testdir/test64.in
diff --git a/src/testdir/test64.ok b/src/nvim/testdir/test64.ok
index a1498ea5d6..a1498ea5d6 100644
--- a/src/testdir/test64.ok
+++ b/src/nvim/testdir/test64.ok
diff --git a/src/testdir/test65.in b/src/nvim/testdir/test65.in
index ca53f27555..ca53f27555 100644
--- a/src/testdir/test65.in
+++ b/src/nvim/testdir/test65.in
diff --git a/src/testdir/test65.ok b/src/nvim/testdir/test65.ok
index 7aac326058..7aac326058 100644
--- a/src/testdir/test65.ok
+++ b/src/nvim/testdir/test65.ok
diff --git a/src/testdir/test66.in b/src/nvim/testdir/test66.in
index f1fdce3792..f1fdce3792 100644
--- a/src/testdir/test66.in
+++ b/src/nvim/testdir/test66.in
diff --git a/src/testdir/test66.ok b/src/nvim/testdir/test66.ok
index 4c3ab0fb56..4c3ab0fb56 100644
--- a/src/testdir/test66.ok
+++ b/src/nvim/testdir/test66.ok
diff --git a/src/testdir/test67.in b/src/nvim/testdir/test67.in
index 08b4e3701f..08b4e3701f 100644
--- a/src/testdir/test67.in
+++ b/src/nvim/testdir/test67.in
diff --git a/src/testdir/test67.ok b/src/nvim/testdir/test67.ok
index 51188e5afd..51188e5afd 100644
--- a/src/testdir/test67.ok
+++ b/src/nvim/testdir/test67.ok
diff --git a/src/testdir/test68.in b/src/nvim/testdir/test68.in
index ceaf9af1ab..ceaf9af1ab 100644
--- a/src/testdir/test68.in
+++ b/src/nvim/testdir/test68.in
diff --git a/src/testdir/test68.ok b/src/nvim/testdir/test68.ok
index b3726a0a27..b3726a0a27 100644
--- a/src/testdir/test68.ok
+++ b/src/nvim/testdir/test68.ok
diff --git a/src/testdir/test69.in b/src/nvim/testdir/test69.in
index 75317b4954..75317b4954 100644
--- a/src/testdir/test69.in
+++ b/src/nvim/testdir/test69.in
diff --git a/src/testdir/test69.ok b/src/nvim/testdir/test69.ok
index 41cd9d02c3..41cd9d02c3 100644
--- a/src/testdir/test69.ok
+++ b/src/nvim/testdir/test69.ok
diff --git a/src/testdir/test7.in b/src/nvim/testdir/test7.in
index b9cc0585f6..b9cc0585f6 100644
--- a/src/testdir/test7.in
+++ b/src/nvim/testdir/test7.in
diff --git a/src/testdir/test7.ok b/src/nvim/testdir/test7.ok
index a0d1ff94a3..a0d1ff94a3 100644
--- a/src/testdir/test7.ok
+++ b/src/nvim/testdir/test7.ok
diff --git a/src/testdir/test70.in b/src/nvim/testdir/test70.in
index 9fbe818b3d..9fbe818b3d 100644
--- a/src/testdir/test70.in
+++ b/src/nvim/testdir/test70.in
diff --git a/src/testdir/test70.ok b/src/nvim/testdir/test70.ok
index 9c82a86f2d..9c82a86f2d 100644
--- a/src/testdir/test70.ok
+++ b/src/nvim/testdir/test70.ok
diff --git a/src/testdir/test71.in b/src/nvim/testdir/test71.in
index 155fd413bc..155fd413bc 100644
--- a/src/testdir/test71.in
+++ b/src/nvim/testdir/test71.in
diff --git a/src/testdir/test71.ok b/src/nvim/testdir/test71.ok
index 24652c4380..24652c4380 100644
--- a/src/testdir/test71.ok
+++ b/src/nvim/testdir/test71.ok
diff --git a/src/testdir/test71a.in b/src/nvim/testdir/test71a.in
index 85bd22cd01..85bd22cd01 100644
--- a/src/testdir/test71a.in
+++ b/src/nvim/testdir/test71a.in
diff --git a/src/testdir/test72.in b/src/nvim/testdir/test72.in
index 220adad67a..220adad67a 100644
--- a/src/testdir/test72.in
+++ b/src/nvim/testdir/test72.in
diff --git a/src/testdir/test72.ok b/src/nvim/testdir/test72.ok
index bb267d0d8b..bb267d0d8b 100644
--- a/src/testdir/test72.ok
+++ b/src/nvim/testdir/test72.ok
diff --git a/src/testdir/test73.in b/src/nvim/testdir/test73.in
index 666e4d2e50..666e4d2e50 100644
--- a/src/testdir/test73.in
+++ b/src/nvim/testdir/test73.in
diff --git a/src/testdir/test73.ok b/src/nvim/testdir/test73.ok
index 90efab756f..90efab756f 100644
--- a/src/testdir/test73.ok
+++ b/src/nvim/testdir/test73.ok
diff --git a/src/testdir/test74.in b/src/nvim/testdir/test74.in
index 4fbe5e4d01..4fbe5e4d01 100644
--- a/src/testdir/test74.in
+++ b/src/nvim/testdir/test74.in
diff --git a/src/testdir/test74.ok b/src/nvim/testdir/test74.ok
index b026c33c35..b026c33c35 100644
--- a/src/testdir/test74.ok
+++ b/src/nvim/testdir/test74.ok
diff --git a/src/testdir/test75.in b/src/nvim/testdir/test75.in
index b7f2783f54..b7f2783f54 100644
--- a/src/testdir/test75.in
+++ b/src/nvim/testdir/test75.in
diff --git a/src/testdir/test75.ok b/src/nvim/testdir/test75.ok
index a2c5c5ac3d..a2c5c5ac3d 100644
--- a/src/testdir/test75.ok
+++ b/src/nvim/testdir/test75.ok
diff --git a/src/testdir/test76.in b/src/nvim/testdir/test76.in
index db7ebe2169..db7ebe2169 100644
--- a/src/testdir/test76.in
+++ b/src/nvim/testdir/test76.in
diff --git a/src/testdir/test76.ok b/src/nvim/testdir/test76.ok
index 2a70acbade..2a70acbade 100644
--- a/src/testdir/test76.ok
+++ b/src/nvim/testdir/test76.ok
diff --git a/src/testdir/test77.in b/src/nvim/testdir/test77.in
index 0dbc4fcbaf..0dbc4fcbaf 100644
--- a/src/testdir/test77.in
+++ b/src/nvim/testdir/test77.in
diff --git a/src/testdir/test77.ok b/src/nvim/testdir/test77.ok
index 11f148c73f..11f148c73f 100644
--- a/src/testdir/test77.ok
+++ b/src/nvim/testdir/test77.ok
diff --git a/src/testdir/test78.in b/src/nvim/testdir/test78.in
index 1850bd9236..1850bd9236 100644
--- a/src/testdir/test78.in
+++ b/src/nvim/testdir/test78.in
diff --git a/src/testdir/test78.ok b/src/nvim/testdir/test78.ok
index 6c3ecefe3c..6c3ecefe3c 100644
--- a/src/testdir/test78.ok
+++ b/src/nvim/testdir/test78.ok
diff --git a/src/testdir/test79.in b/src/nvim/testdir/test79.in
index 8278bd8000..8278bd8000 100644
--- a/src/testdir/test79.in
+++ b/src/nvim/testdir/test79.in
diff --git a/src/testdir/test79.ok b/src/nvim/testdir/test79.ok
index e22eee0b71..e22eee0b71 100644
--- a/src/testdir/test79.ok
+++ b/src/nvim/testdir/test79.ok
diff --git a/src/testdir/test8.in b/src/nvim/testdir/test8.in
index d9d00d97ae..d9d00d97ae 100644
--- a/src/testdir/test8.in
+++ b/src/nvim/testdir/test8.in
diff --git a/src/testdir/test8.ok b/src/nvim/testdir/test8.ok
index adecb2f4be..adecb2f4be 100644
--- a/src/testdir/test8.ok
+++ b/src/nvim/testdir/test8.ok
diff --git a/src/testdir/test80.in b/src/nvim/testdir/test80.in
index 406fb6dac7..406fb6dac7 100644
--- a/src/testdir/test80.in
+++ b/src/nvim/testdir/test80.in
diff --git a/src/testdir/test80.ok b/src/nvim/testdir/test80.ok
index b42f604a07..b42f604a07 100644
--- a/src/testdir/test80.ok
+++ b/src/nvim/testdir/test80.ok
diff --git a/src/testdir/test81.in b/src/nvim/testdir/test81.in
index 82a6892a1d..82a6892a1d 100644
--- a/src/testdir/test81.in
+++ b/src/nvim/testdir/test81.in
diff --git a/src/testdir/test81.ok b/src/nvim/testdir/test81.ok
index e9f17dc4f8..e9f17dc4f8 100644
--- a/src/testdir/test81.ok
+++ b/src/nvim/testdir/test81.ok
diff --git a/src/testdir/test82.in b/src/nvim/testdir/test82.in
index 8503f5488f..8503f5488f 100644
--- a/src/testdir/test82.in
+++ b/src/nvim/testdir/test82.in
diff --git a/src/testdir/test82.ok b/src/nvim/testdir/test82.ok
index 3f1866a0fb..3f1866a0fb 100644
--- a/src/testdir/test82.ok
+++ b/src/nvim/testdir/test82.ok
diff --git a/src/testdir/test83-tags2 b/src/nvim/testdir/test83-tags2
index 7f9f21b0eb..7f9f21b0eb 100644
--- a/src/testdir/test83-tags2
+++ b/src/nvim/testdir/test83-tags2
diff --git a/src/testdir/test83-tags3 b/src/nvim/testdir/test83-tags3
index 0cb6591562..0cb6591562 100644
--- a/src/testdir/test83-tags3
+++ b/src/nvim/testdir/test83-tags3
diff --git a/src/testdir/test83.in b/src/nvim/testdir/test83.in
index 297d560d2f..297d560d2f 100644
--- a/src/testdir/test83.in
+++ b/src/nvim/testdir/test83.in
diff --git a/src/testdir/test83.ok b/src/nvim/testdir/test83.ok
index 61a1a04a18..61a1a04a18 100644
--- a/src/testdir/test83.ok
+++ b/src/nvim/testdir/test83.ok
diff --git a/src/testdir/test84.in b/src/nvim/testdir/test84.in
index 25482db54c..25482db54c 100644
--- a/src/testdir/test84.in
+++ b/src/nvim/testdir/test84.in
diff --git a/src/testdir/test84.ok b/src/nvim/testdir/test84.ok
index 8b8e4ee824..8b8e4ee824 100644
--- a/src/testdir/test84.ok
+++ b/src/nvim/testdir/test84.ok
diff --git a/src/testdir/test85.in b/src/nvim/testdir/test85.in
index c5ca873a49..c5ca873a49 100644
--- a/src/testdir/test85.in
+++ b/src/nvim/testdir/test85.in
diff --git a/src/testdir/test85.ok b/src/nvim/testdir/test85.ok
index 4753483240..4753483240 100644
--- a/src/testdir/test85.ok
+++ b/src/nvim/testdir/test85.ok
diff --git a/src/testdir/test86.in b/src/nvim/testdir/test86.in
index 240e07e477..240e07e477 100644
--- a/src/testdir/test86.in
+++ b/src/nvim/testdir/test86.in
diff --git a/src/testdir/test86.ok b/src/nvim/testdir/test86.ok
index 257a5ee4cd..257a5ee4cd 100644
--- a/src/testdir/test86.ok
+++ b/src/nvim/testdir/test86.ok
diff --git a/src/testdir/test87.in b/src/nvim/testdir/test87.in
index e45883b59d..e45883b59d 100644
--- a/src/testdir/test87.in
+++ b/src/nvim/testdir/test87.in
diff --git a/src/testdir/test87.ok b/src/nvim/testdir/test87.ok
index d1ec84c6b8..d1ec84c6b8 100644
--- a/src/testdir/test87.ok
+++ b/src/nvim/testdir/test87.ok
diff --git a/src/testdir/test88.in b/src/nvim/testdir/test88.in
index c2e6a752fa..c2e6a752fa 100644
--- a/src/testdir/test88.in
+++ b/src/nvim/testdir/test88.in
diff --git a/src/testdir/test88.ok b/src/nvim/testdir/test88.ok
index e29698b7bd..e29698b7bd 100644
--- a/src/testdir/test88.ok
+++ b/src/nvim/testdir/test88.ok
diff --git a/src/testdir/test89.in b/src/nvim/testdir/test89.in
index 1c3079f62f..1c3079f62f 100644
--- a/src/testdir/test89.in
+++ b/src/nvim/testdir/test89.in
diff --git a/src/testdir/test89.ok b/src/nvim/testdir/test89.ok
index 90034758d9..90034758d9 100644
--- a/src/testdir/test89.ok
+++ b/src/nvim/testdir/test89.ok
diff --git a/src/testdir/test9.in b/src/nvim/testdir/test9.in
index 84e17943c7..84e17943c7 100644
--- a/src/testdir/test9.in
+++ b/src/nvim/testdir/test9.in
diff --git a/src/testdir/test9.ok b/src/nvim/testdir/test9.ok
index cccb5f3ef2..cccb5f3ef2 100644
--- a/src/testdir/test9.ok
+++ b/src/nvim/testdir/test9.ok
diff --git a/src/testdir/test90.in b/src/nvim/testdir/test90.in
index 6bac414f31..6bac414f31 100644
--- a/src/testdir/test90.in
+++ b/src/nvim/testdir/test90.in
diff --git a/src/testdir/test90.ok b/src/nvim/testdir/test90.ok
index 9a8e7fe961..9a8e7fe961 100644
--- a/src/testdir/test90.ok
+++ b/src/nvim/testdir/test90.ok
diff --git a/src/testdir/test91.in b/src/nvim/testdir/test91.in
index e900a522df..e900a522df 100644
--- a/src/testdir/test91.in
+++ b/src/nvim/testdir/test91.in
diff --git a/src/testdir/test91.ok b/src/nvim/testdir/test91.ok
index 22e1572209..22e1572209 100644
--- a/src/testdir/test91.ok
+++ b/src/nvim/testdir/test91.ok
diff --git a/src/testdir/test92.in b/src/nvim/testdir/test92.in
index 9593aec4c7..9593aec4c7 100644
--- a/src/testdir/test92.in
+++ b/src/nvim/testdir/test92.in
diff --git a/src/testdir/test92.ok b/src/nvim/testdir/test92.ok
index cca5ec487c..cca5ec487c 100644
--- a/src/testdir/test92.ok
+++ b/src/nvim/testdir/test92.ok
diff --git a/src/testdir/test93.in b/src/nvim/testdir/test93.in
index 877838ce1b..877838ce1b 100644
--- a/src/testdir/test93.in
+++ b/src/nvim/testdir/test93.in
diff --git a/src/testdir/test93.ok b/src/nvim/testdir/test93.ok
index cca5ec487c..cca5ec487c 100644
--- a/src/testdir/test93.ok
+++ b/src/nvim/testdir/test93.ok
diff --git a/src/testdir/test94.in b/src/nvim/testdir/test94.in
index dfa91d8340..dfa91d8340 100644
--- a/src/testdir/test94.in
+++ b/src/nvim/testdir/test94.in
diff --git a/src/testdir/test94.ok b/src/nvim/testdir/test94.ok
index 3996f2a3a4..3996f2a3a4 100644
--- a/src/testdir/test94.ok
+++ b/src/nvim/testdir/test94.ok
diff --git a/src/testdir/test95.in b/src/nvim/testdir/test95.in
index 90fa69945a..90fa69945a 100644
--- a/src/testdir/test95.in
+++ b/src/nvim/testdir/test95.in
diff --git a/src/testdir/test95.ok b/src/nvim/testdir/test95.ok
index c378221a70..c378221a70 100644
--- a/src/testdir/test95.ok
+++ b/src/nvim/testdir/test95.ok
diff --git a/src/testdir/test96.in b/src/nvim/testdir/test96.in
index 9d1a2c83a5..9d1a2c83a5 100644
--- a/src/testdir/test96.in
+++ b/src/nvim/testdir/test96.in
diff --git a/src/testdir/test96.ok b/src/nvim/testdir/test96.ok
index 3498e52f73..3498e52f73 100644
--- a/src/testdir/test96.ok
+++ b/src/nvim/testdir/test96.ok
diff --git a/src/testdir/test97.in b/src/nvim/testdir/test97.in
index 13e9dd5b6e..13e9dd5b6e 100644
--- a/src/testdir/test97.in
+++ b/src/nvim/testdir/test97.in
diff --git a/src/testdir/test97.ok b/src/nvim/testdir/test97.ok
index afa96a4de4..afa96a4de4 100644
--- a/src/testdir/test97.ok
+++ b/src/nvim/testdir/test97.ok
diff --git a/src/testdir/test98.in b/src/nvim/testdir/test98.in
index 83ccba09e9..83ccba09e9 100644
--- a/src/testdir/test98.in
+++ b/src/nvim/testdir/test98.in
diff --git a/src/testdir/test98.ok b/src/nvim/testdir/test98.ok
index 356ddd8eac..356ddd8eac 100644
--- a/src/testdir/test98.ok
+++ b/src/nvim/testdir/test98.ok
diff --git a/src/testdir/test99.in b/src/nvim/testdir/test99.in
index 77828f4b68..77828f4b68 100644
--- a/src/testdir/test99.in
+++ b/src/nvim/testdir/test99.in
diff --git a/src/testdir/test99.ok b/src/nvim/testdir/test99.ok
index 0bd0b8ab73..0bd0b8ab73 100644
--- a/src/testdir/test99.ok
+++ b/src/nvim/testdir/test99.ok
diff --git a/src/testdir/test_eval.in b/src/nvim/testdir/test_eval.in
index c34f5cb50e..c34f5cb50e 100644
--- a/src/testdir/test_eval.in
+++ b/src/nvim/testdir/test_eval.in
diff --git a/src/testdir/test_eval.ok b/src/nvim/testdir/test_eval.ok
index 162e1b12fd..162e1b12fd 100644
--- a/src/testdir/test_eval.ok
+++ b/src/nvim/testdir/test_eval.ok
diff --git a/src/testdir/test_eval_func.vim b/src/nvim/testdir/test_eval_func.vim
index 48d01df27d..48d01df27d 100644
--- a/src/testdir/test_eval_func.vim
+++ b/src/nvim/testdir/test_eval_func.vim
diff --git a/src/testdir/unix.vim b/src/nvim/testdir/unix.vim
index f766e74c30..f766e74c30 100644
--- a/src/testdir/unix.vim
+++ b/src/nvim/testdir/unix.vim
diff --git a/src/types.h b/src/nvim/types.h
index 14ffd9fbb7..14ffd9fbb7 100644
--- a/src/types.h
+++ b/src/nvim/types.h
diff --git a/src/ui.c b/src/nvim/ui.c
index 4678416200..4678416200 100644
--- a/src/ui.c
+++ b/src/nvim/ui.c
diff --git a/src/ui.h b/src/nvim/ui.h
index aed242c262..aed242c262 100644
--- a/src/ui.h
+++ b/src/nvim/ui.h
diff --git a/src/undo.c b/src/nvim/undo.c
index 47ce8ee8da..47ce8ee8da 100644
--- a/src/undo.c
+++ b/src/nvim/undo.c
diff --git a/src/undo.h b/src/nvim/undo.h
index 7f12ba577c..7f12ba577c 100644
--- a/src/undo.h
+++ b/src/nvim/undo.h
diff --git a/src/undo_defs.h b/src/nvim/undo_defs.h
index f1e6c83c32..f1e6c83c32 100644
--- a/src/undo_defs.h
+++ b/src/nvim/undo_defs.h
diff --git a/src/version.c b/src/nvim/version.c
index d4df349741..d4df349741 100644
--- a/src/version.c
+++ b/src/nvim/version.c
diff --git a/src/version.h b/src/nvim/version.h
index f5699bfdf6..f5699bfdf6 100644
--- a/src/version.h
+++ b/src/nvim/version.h
diff --git a/src/version_defs.h b/src/nvim/version_defs.h
index 87487c2624..87487c2624 100644
--- a/src/version_defs.h
+++ b/src/nvim/version_defs.h
diff --git a/src/vim.h b/src/nvim/vim.h
index 0032032fcf..0032032fcf 100644
--- a/src/vim.h
+++ b/src/nvim/vim.h
diff --git a/src/window.c b/src/nvim/window.c
index 27582184d7..27582184d7 100644
--- a/src/window.c
+++ b/src/nvim/window.c
diff --git a/src/window.h b/src/nvim/window.h
index 86a5bba2b4..86a5bba2b4 100644
--- a/src/window.h
+++ b/src/nvim/window.h