Post-cvs2svn flatten pass.

292 files changed, 0 insertions, 0 deletions

diff --git a/contrib/nvi/FAQ b/FAQ
index 357650a589bd..357650a589bd 100644
--- a/contrib/nvi/FAQ
+++ b/FAQ
diff --git a/contrib/nvi/LAYOUT b/LAYOUT
index e3a55ebb5778..e3a55ebb5778 100644
--- a/contrib/nvi/LAYOUT
+++ b/LAYOUT
diff --git a/contrib/nvi/LICENSE b/LICENSE
index 78e8f4a40e19..78e8f4a40e19 100644
--- a/contrib/nvi/LICENSE
+++ b/LICENSE
diff --git a/contrib/nvi/README b/README
index 33db36a5c862..33db36a5c862 100644
--- a/contrib/nvi/README
+++ b/README
diff --git a/contrib/nvi/build/ExtUtils/Embed.pm b/build/ExtUtils/Embed.pm
index 04525c18c908..04525c18c908 100644
--- a/contrib/nvi/build/ExtUtils/Embed.pm
+++ b/build/ExtUtils/Embed.pm
diff --git a/contrib/nvi/build/Makefile.in b/build/Makefile.in
index 54025e7d3b9d..54025e7d3b9d 100644
--- a/contrib/nvi/build/Makefile.in
+++ b/build/Makefile.in
diff --git a/contrib/nvi/build/README b/build/README
index efbce2b9dfbb..efbce2b9dfbb 100644
--- a/contrib/nvi/build/README
+++ b/build/README
diff --git a/contrib/nvi/build/README.LynxOS b/build/README.LynxOS
index 2cc68dafc861..2cc68dafc861 100644
--- a/contrib/nvi/build/README.LynxOS
+++ b/build/README.LynxOS
diff --git a/contrib/nvi/build/acconfig.h b/build/acconfig.h
index 567f9ee60070..567f9ee60070 100644
--- a/contrib/nvi/build/acconfig.h
+++ b/build/acconfig.h
diff --git a/contrib/nvi/build/aclocal.m4 b/build/aclocal.m4
index de7e57ed3aac..de7e57ed3aac 100644
--- a/contrib/nvi/build/aclocal.m4
+++ b/build/aclocal.m4
diff --git a/contrib/nvi/build/config.guess b/build/config.guess
index 4c314d97aacb..4c314d97aacb 100755
--- a/contrib/nvi/build/config.guess
+++ b/build/config.guess
diff --git a/contrib/nvi/build/config.h.in b/build/config.h.in
index c87fcdd7f214..c87fcdd7f214 100644
--- a/contrib/nvi/build/config.h.in
+++ b/build/config.h.in
diff --git a/contrib/nvi/build/config.sub b/build/config.sub
index 43f086781962..43f086781962 100755
--- a/contrib/nvi/build/config.sub
+++ b/build/config.sub
diff --git a/contrib/nvi/build/configure b/build/configure
index e2055d113ca8..e2055d113ca8 100755
--- a/contrib/nvi/build/configure
+++ b/build/configure
diff --git a/contrib/nvi/build/configure.in b/build/configure.in
index cb8e4637d957..cb8e4637d957 100644
--- a/contrib/nvi/build/configure.in
+++ b/build/configure.in
diff --git a/contrib/nvi/build/distrib b/build/distrib
index 45dbe52f4049..45dbe52f4049 100644
--- a/contrib/nvi/build/distrib
+++ b/build/distrib
diff --git a/contrib/nvi/build/install-sh b/build/install-sh
index ab74c882e923..ab74c882e923 100755
--- a/contrib/nvi/build/install-sh
+++ b/build/install-sh
diff --git a/contrib/nvi/build/pathnames.h.in b/build/pathnames.h.in
index 09cf97460ae8..09cf97460ae8 100644
--- a/contrib/nvi/build/pathnames.h.in
+++ b/build/pathnames.h.in
diff --git a/contrib/nvi/build/port.h.in b/build/port.h.in
index 6696848ecc7d..6696848ecc7d 100644
--- a/contrib/nvi/build/port.h.in
+++ b/build/port.h.in
diff --git a/contrib/nvi/build/recover.in b/build/recover.in
index cfaf75f2c287..cfaf75f2c287 100644
--- a/contrib/nvi/build/recover.in
+++ b/build/recover.in
diff --git a/contrib/nvi/build/spell.ok b/build/spell.ok
index fc103f43602d..fc103f43602d 100644
--- a/contrib/nvi/build/spell.ok
+++ b/build/spell.ok
diff --git a/contrib/nvi/catalog/Makefile b/catalog/Makefile
index 1044051ff389..1044051ff389 100644
--- a/contrib/nvi/catalog/Makefile
+++ b/catalog/Makefile
diff --git a/contrib/nvi/catalog/README b/catalog/README
index 15a706358869..15a706358869 100644
--- a/contrib/nvi/catalog/README
+++ b/catalog/README
diff --git a/contrib/nvi/catalog/dump.c b/catalog/dump.c
index 0b3cd26520d5..0b3cd26520d5 100644
--- a/contrib/nvi/catalog/dump.c
+++ b/catalog/dump.c
diff --git a/contrib/nvi/catalog/dutch b/catalog/dutch
index de9fb603bf8e..de9fb603bf8e 100644
--- a/contrib/nvi/catalog/dutch
+++ b/catalog/dutch
diff --git a/contrib/nvi/catalog/dutch.base b/catalog/dutch.base
index 2d8667e6d460..2d8667e6d460 100644
--- a/contrib/nvi/catalog/dutch.base
+++ b/catalog/dutch.base
diff --git a/contrib/nvi/catalog/dutch.check b/catalog/dutch.check
index d651aec75cc2..d651aec75cc2 100644
--- a/contrib/nvi/catalog/dutch.check
+++ b/catalog/dutch.check
diff --git a/contrib/nvi/catalog/dutch.owner b/catalog/dutch.owner
index 27f47d30dbb3..27f47d30dbb3 100644
--- a/contrib/nvi/catalog/dutch.owner
+++ b/catalog/dutch.owner
diff --git a/contrib/nvi/catalog/english b/catalog/english
index f34451d9b6d5..f34451d9b6d5 100644
--- a/contrib/nvi/catalog/english
+++ b/catalog/english
diff --git a/contrib/nvi/catalog/english.base b/catalog/english.base
index 6d8d7bf60bbf..6d8d7bf60bbf 100644
--- a/contrib/nvi/catalog/english.base
+++ b/catalog/english.base
diff --git a/contrib/nvi/catalog/english.check b/catalog/english.check
index 51093785c87c..51093785c87c 100644
--- a/contrib/nvi/catalog/english.check
+++ b/catalog/english.check
diff --git a/contrib/nvi/catalog/english.owner b/catalog/english.owner
index 034567ddd8b5..034567ddd8b5 100644
--- a/contrib/nvi/catalog/english.owner
+++ b/catalog/english.owner
diff --git a/contrib/nvi/catalog/french b/catalog/french
index a75c486ef9ba..a75c486ef9ba 100644
--- a/contrib/nvi/catalog/french
+++ b/catalog/french
diff --git a/contrib/nvi/catalog/french.base b/catalog/french.base
index db2d45f9b220..db2d45f9b220 100644
--- a/contrib/nvi/catalog/french.base
+++ b/catalog/french.base
diff --git a/contrib/nvi/catalog/french.check b/catalog/french.check
index 1e53d93cb446..1e53d93cb446 100644
--- a/contrib/nvi/catalog/french.check
+++ b/catalog/french.check
diff --git a/contrib/nvi/catalog/german b/catalog/german
index 0810ba6cf9b4..0810ba6cf9b4 100644
--- a/contrib/nvi/catalog/german
+++ b/catalog/german
diff --git a/contrib/nvi/catalog/german.base b/catalog/german.base
index 135b72da7994..135b72da7994 100644
--- a/contrib/nvi/catalog/german.base
+++ b/catalog/german.base
diff --git a/contrib/nvi/catalog/german.check b/catalog/german.check
index 4fd60c14e63b..4fd60c14e63b 100644
--- a/contrib/nvi/catalog/german.check
+++ b/catalog/german.check
diff --git a/contrib/nvi/catalog/german.owner b/catalog/german.owner
index e72e8ae268fc..e72e8ae268fc 100644
--- a/contrib/nvi/catalog/german.owner
+++ b/catalog/german.owner
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R b/catalog/ru_RU.KOI8-R
index 7eb35b9cf262..7eb35b9cf262 100644
--- a/contrib/nvi/catalog/ru_RU.KOI8-R
+++ b/catalog/ru_RU.KOI8-R
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R.base b/catalog/ru_RU.KOI8-R.base
index 59efd3f53a5f..59efd3f53a5f 100644
--- a/contrib/nvi/catalog/ru_RU.KOI8-R.base
+++ b/catalog/ru_RU.KOI8-R.base
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R.check b/catalog/ru_RU.KOI8-R.check
index ca77b891051a..ca77b891051a 100644
--- a/contrib/nvi/catalog/ru_RU.KOI8-R.check
+++ b/catalog/ru_RU.KOI8-R.check
diff --git a/contrib/nvi/catalog/ru_RU.KOI8-R.owner b/catalog/ru_RU.KOI8-R.owner
index bf4fa180298c..bf4fa180298c 100644
--- a/contrib/nvi/catalog/ru_RU.KOI8-R.owner
+++ b/catalog/ru_RU.KOI8-R.owner
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R b/catalog/ru_SU.KOI8-R
index 7eb35b9cf262..7eb35b9cf262 100644
--- a/contrib/nvi/catalog/ru_SU.KOI8-R
+++ b/catalog/ru_SU.KOI8-R
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R.base b/catalog/ru_SU.KOI8-R.base
index 59efd3f53a5f..59efd3f53a5f 100644
--- a/contrib/nvi/catalog/ru_SU.KOI8-R.base
+++ b/catalog/ru_SU.KOI8-R.base
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R.check b/catalog/ru_SU.KOI8-R.check
index ca77b891051a..ca77b891051a 100644
--- a/contrib/nvi/catalog/ru_SU.KOI8-R.check
+++ b/catalog/ru_SU.KOI8-R.check
diff --git a/contrib/nvi/catalog/ru_SU.KOI8-R.owner b/catalog/ru_SU.KOI8-R.owner
index bf4fa180298c..bf4fa180298c 100644
--- a/contrib/nvi/catalog/ru_SU.KOI8-R.owner
+++ b/catalog/ru_SU.KOI8-R.owner
diff --git a/contrib/nvi/catalog/spanish b/catalog/spanish
index fb67ee9dc422..fb67ee9dc422 100644
--- a/contrib/nvi/catalog/spanish
+++ b/catalog/spanish
diff --git a/contrib/nvi/catalog/spanish.base b/catalog/spanish.base
index 270199eee5c8..270199eee5c8 100644
--- a/contrib/nvi/catalog/spanish.base
+++ b/catalog/spanish.base
diff --git a/contrib/nvi/catalog/spanish.check b/catalog/spanish.check
index c04785e3a2ef..c04785e3a2ef 100644
--- a/contrib/nvi/catalog/spanish.check
+++ b/catalog/spanish.check
diff --git a/contrib/nvi/catalog/spell.ok b/catalog/spell.ok
index 00be47141879..00be47141879 100644
--- a/contrib/nvi/catalog/spell.ok
+++ b/catalog/spell.ok
diff --git a/contrib/nvi/catalog/swedish b/catalog/swedish
index 044b354fa070..044b354fa070 100644
--- a/contrib/nvi/catalog/swedish
+++ b/catalog/swedish
diff --git a/contrib/nvi/catalog/swedish.base b/catalog/swedish.base
index 43bf7765a25e..43bf7765a25e 100644
--- a/contrib/nvi/catalog/swedish.base
+++ b/catalog/swedish.base
diff --git a/contrib/nvi/catalog/swedish.check b/catalog/swedish.check
index c70b9bbd4095..c70b9bbd4095 100644
--- a/contrib/nvi/catalog/swedish.check
+++ b/catalog/swedish.check
diff --git a/contrib/nvi/catalog/swedish.owner b/catalog/swedish.owner
index 2b36f2d324b8..2b36f2d324b8 100644
--- a/contrib/nvi/catalog/swedish.owner
+++ b/catalog/swedish.owner
diff --git a/contrib/nvi/cl/README.signal b/cl/README.signal
index 7faa45673b75..7faa45673b75 100644
--- a/contrib/nvi/cl/README.signal
+++ b/cl/README.signal
diff --git a/contrib/nvi/cl/cl.h b/cl/cl.h
index 2ef2b8d1f81e..2ef2b8d1f81e 100644
--- a/contrib/nvi/cl/cl.h
+++ b/cl/cl.h
diff --git a/contrib/nvi/cl/cl_bsd.c b/cl/cl_bsd.c
index 22124e5780b2..22124e5780b2 100644
--- a/contrib/nvi/cl/cl_bsd.c
+++ b/cl/cl_bsd.c
diff --git a/contrib/nvi/cl/cl_funcs.c b/cl/cl_funcs.c
index 40315ee85e89..40315ee85e89 100644
--- a/contrib/nvi/cl/cl_funcs.c
+++ b/cl/cl_funcs.c
diff --git a/contrib/nvi/cl/cl_main.c b/cl/cl_main.c
index 2889f709cbb2..2889f709cbb2 100644
--- a/contrib/nvi/cl/cl_main.c
+++ b/cl/cl_main.c
diff --git a/contrib/nvi/cl/cl_read.c b/cl/cl_read.c
index 8a95a77b2438..8a95a77b2438 100644
--- a/contrib/nvi/cl/cl_read.c
+++ b/cl/cl_read.c
diff --git a/contrib/nvi/cl/cl_screen.c b/cl/cl_screen.c
index 2ce58e80cc78..2ce58e80cc78 100644
--- a/contrib/nvi/cl/cl_screen.c
+++ b/cl/cl_screen.c
diff --git a/contrib/nvi/cl/cl_term.c b/cl/cl_term.c
index c36bb3830e9f..c36bb3830e9f 100644
--- a/contrib/nvi/cl/cl_term.c
+++ b/cl/cl_term.c
diff --git a/contrib/nvi/clib/bsearch.c b/clib/bsearch.c
index 6b41ab5fcef8..6b41ab5fcef8 100644
--- a/contrib/nvi/clib/bsearch.c
+++ b/clib/bsearch.c
diff --git a/contrib/nvi/clib/env.c b/clib/env.c
index 5a45dc1760a6..5a45dc1760a6 100644
--- a/contrib/nvi/clib/env.c
+++ b/clib/env.c
diff --git a/contrib/nvi/clib/gethostname.c b/clib/gethostname.c
index 5b8e85acf9f2..5b8e85acf9f2 100644
--- a/contrib/nvi/clib/gethostname.c
+++ b/clib/gethostname.c
diff --git a/contrib/nvi/clib/getopt.c b/clib/getopt.c
index b173017503e1..b173017503e1 100644
--- a/contrib/nvi/clib/getopt.c
+++ b/clib/getopt.c
diff --git a/contrib/nvi/clib/memchr.c b/clib/memchr.c
index b6d4c311bff6..b6d4c311bff6 100644
--- a/contrib/nvi/clib/memchr.c
+++ b/clib/memchr.c
diff --git a/contrib/nvi/clib/memmove.c b/clib/memmove.c
index 7f4376272b67..7f4376272b67 100644
--- a/contrib/nvi/clib/memmove.c
+++ b/clib/memmove.c
diff --git a/contrib/nvi/clib/memset.c b/clib/memset.c
index 0013d66df06d..0013d66df06d 100644
--- a/contrib/nvi/clib/memset.c
+++ b/clib/memset.c
diff --git a/contrib/nvi/clib/mkstemp.c b/clib/mkstemp.c
index 1faffddfbe2d..1faffddfbe2d 100644
--- a/contrib/nvi/clib/mkstemp.c
+++ b/clib/mkstemp.c
diff --git a/contrib/nvi/clib/mmap.c b/clib/mmap.c
index 7cea169650b4..7cea169650b4 100644
--- a/contrib/nvi/clib/mmap.c
+++ b/clib/mmap.c
diff --git a/contrib/nvi/clib/snprintf.c b/clib/snprintf.c
index 935522ce5436..935522ce5436 100644
--- a/contrib/nvi/clib/snprintf.c
+++ b/clib/snprintf.c
diff --git a/contrib/nvi/clib/strdup.c b/clib/strdup.c
index 4bc2303cee54..4bc2303cee54 100644
--- a/contrib/nvi/clib/strdup.c
+++ b/clib/strdup.c
diff --git a/contrib/nvi/clib/strerror.c b/clib/strerror.c
index cf5910d0fc83..cf5910d0fc83 100644
--- a/contrib/nvi/clib/strerror.c
+++ b/clib/strerror.c
diff --git a/contrib/nvi/clib/strpbrk.c b/clib/strpbrk.c
index 22abbb0da4b5..22abbb0da4b5 100644
--- a/contrib/nvi/clib/strpbrk.c
+++ b/clib/strpbrk.c
diff --git a/contrib/nvi/clib/strsep.c b/clib/strsep.c
index 33115f0e4121..33115f0e4121 100644
--- a/contrib/nvi/clib/strsep.c
+++ b/clib/strsep.c
diff --git a/contrib/nvi/clib/strtol.c b/clib/strtol.c
index 50c724ff432f..50c724ff432f 100644
--- a/contrib/nvi/clib/strtol.c
+++ b/clib/strtol.c
diff --git a/contrib/nvi/clib/strtoul.c b/clib/strtoul.c
index 890bdbd747a7..890bdbd747a7 100644
--- a/contrib/nvi/clib/strtoul.c
+++ b/clib/strtoul.c
diff --git a/contrib/nvi/clib/vsnprintf.c b/clib/vsnprintf.c
index a1b013ad196f..a1b013ad196f 100644
--- a/contrib/nvi/clib/vsnprintf.c
+++ b/clib/vsnprintf.c
diff --git a/contrib/nvi/common/api.c b/common/api.c
index 35d9f0c8f66e..35d9f0c8f66e 100644
--- a/contrib/nvi/common/api.c
+++ b/common/api.c
diff --git a/contrib/nvi/common/args.h b/common/args.h
index e84dc2ca04c1..e84dc2ca04c1 100644
--- a/contrib/nvi/common/args.h
+++ b/common/args.h
diff --git a/contrib/nvi/common/common.h b/common/common.h
index 0e13fc80b844..0e13fc80b844 100644
--- a/contrib/nvi/common/common.h
+++ b/common/common.h
diff --git a/contrib/nvi/common/cut.c b/common/cut.c
index faceecd11166..faceecd11166 100644
--- a/contrib/nvi/common/cut.c
+++ b/common/cut.c
diff --git a/contrib/nvi/common/cut.h b/common/cut.h
index 43f3ca817efd..43f3ca817efd 100644
--- a/contrib/nvi/common/cut.h
+++ b/common/cut.h
diff --git a/contrib/nvi/common/delete.c b/common/delete.c
index 001788f9bb38..001788f9bb38 100644
--- a/contrib/nvi/common/delete.c
+++ b/common/delete.c
diff --git a/contrib/nvi/common/exf.c b/common/exf.c
index 2993b0f4a8a5..2993b0f4a8a5 100644
--- a/contrib/nvi/common/exf.c
+++ b/common/exf.c
diff --git a/contrib/nvi/common/exf.h b/common/exf.h
index cdfaa8294485..cdfaa8294485 100644
--- a/contrib/nvi/common/exf.h
+++ b/common/exf.h
diff --git a/contrib/nvi/common/gs.h b/common/gs.h
index e5a43a656ac2..e5a43a656ac2 100644
--- a/contrib/nvi/common/gs.h
+++ b/common/gs.h
diff --git a/contrib/nvi/common/key.c b/common/key.c
index e1311ab571b0..e1311ab571b0 100644
--- a/contrib/nvi/common/key.c
+++ b/common/key.c
diff --git a/contrib/nvi/common/key.h b/common/key.h
index 76fb64f8e1ec..76fb64f8e1ec 100644
--- a/contrib/nvi/common/key.h
+++ b/common/key.h
diff --git a/contrib/nvi/common/line.c b/common/line.c
index bcb9e0c86bcb..bcb9e0c86bcb 100644
--- a/contrib/nvi/common/line.c
+++ b/common/line.c
diff --git a/contrib/nvi/common/log.c b/common/log.c
index 9a9fe793ffb8..9a9fe793ffb8 100644
--- a/contrib/nvi/common/log.c
+++ b/common/log.c
diff --git a/contrib/nvi/common/log.h b/common/log.h
index df307319b1d3..df307319b1d3 100644
--- a/contrib/nvi/common/log.h
+++ b/common/log.h
diff --git a/contrib/nvi/common/main.c b/common/main.c
index 6fb2ed1fe2f0..6fb2ed1fe2f0 100644
--- a/contrib/nvi/common/main.c
+++ b/common/main.c
diff --git a/contrib/nvi/common/mark.c b/common/mark.c
index 0ac1fc28bf9c..0ac1fc28bf9c 100644
--- a/contrib/nvi/common/mark.c
+++ b/common/mark.c
diff --git a/contrib/nvi/common/mark.h b/common/mark.h
index 9c63e183e83f..9c63e183e83f 100644
--- a/contrib/nvi/common/mark.h
+++ b/common/mark.h
diff --git a/contrib/nvi/common/mem.h b/common/mem.h
index af42e6bcd1de..af42e6bcd1de 100644
--- a/contrib/nvi/common/mem.h
+++ b/common/mem.h
diff --git a/contrib/nvi/common/msg.c b/common/msg.c
index 2b18082c7ab8..2b18082c7ab8 100644
--- a/contrib/nvi/common/msg.c
+++ b/common/msg.c
diff --git a/contrib/nvi/common/msg.h b/common/msg.h
index b10f4ccae5c6..b10f4ccae5c6 100644
--- a/contrib/nvi/common/msg.h
+++ b/common/msg.h
diff --git a/contrib/nvi/common/options.awk b/common/options.awk
index 0c91f0718f07..0c91f0718f07 100644
--- a/contrib/nvi/common/options.awk
+++ b/common/options.awk
diff --git a/contrib/nvi/common/options.c b/common/options.c
index 973778c78bbd..973778c78bbd 100644
--- a/contrib/nvi/common/options.c
+++ b/common/options.c
diff --git a/contrib/nvi/common/options.h b/common/options.h
index 2646dc301b5a..2646dc301b5a 100644
--- a/contrib/nvi/common/options.h
+++ b/common/options.h
diff --git a/contrib/nvi/common/options_f.c b/common/options_f.c
index ea3c61160cf5..ea3c61160cf5 100644
--- a/contrib/nvi/common/options_f.c
+++ b/common/options_f.c
diff --git a/contrib/nvi/common/put.c b/common/put.c
index 8c0ca4b7c14f..8c0ca4b7c14f 100644
--- a/contrib/nvi/common/put.c
+++ b/common/put.c
diff --git a/contrib/nvi/common/recover.c b/common/recover.c
index f3abaab5a536..f3abaab5a536 100644
--- a/contrib/nvi/common/recover.c
+++ b/common/recover.c
diff --git a/contrib/nvi/common/screen.c b/common/screen.c
index ba9e287b648b..ba9e287b648b 100644
--- a/contrib/nvi/common/screen.c
+++ b/common/screen.c
diff --git a/contrib/nvi/common/screen.h b/common/screen.h
index bb7254f62a21..bb7254f62a21 100644
--- a/contrib/nvi/common/screen.h
+++ b/common/screen.h
diff --git a/contrib/nvi/common/search.c b/common/search.c
index 3fd2719778fa..3fd2719778fa 100644
--- a/contrib/nvi/common/search.c
+++ b/common/search.c
diff --git a/contrib/nvi/common/seq.c b/common/seq.c
index e2be879ab686..e2be879ab686 100644
--- a/contrib/nvi/common/seq.c
+++ b/common/seq.c
diff --git a/contrib/nvi/common/seq.h b/common/seq.h
index 984bb6c0bd18..984bb6c0bd18 100644
--- a/contrib/nvi/common/seq.h
+++ b/common/seq.h
diff --git a/contrib/nvi/common/util.c b/common/util.c
index 5a4422a2c422..5a4422a2c422 100644
--- a/contrib/nvi/common/util.c
+++ b/common/util.c
diff --git a/contrib/nvi/common/util.h b/common/util.h
index 46edb4aae5a8..46edb4aae5a8 100644
--- a/contrib/nvi/common/util.h
+++ b/common/util.h
diff --git a/contrib/nvi/docs/TODO b/docs/TODO
index 6fe88295d5ff..6fe88295d5ff 100644
--- a/contrib/nvi/docs/TODO
+++ b/docs/TODO
diff --git a/contrib/nvi/docs/USD.doc/edit/Makefile b/docs/USD.doc/edit/Makefile
index 0c59f6d0816e..0c59f6d0816e 100644
--- a/contrib/nvi/docs/USD.doc/edit/Makefile
+++ b/docs/USD.doc/edit/Makefile
diff --git a/contrib/nvi/docs/USD.doc/edit/edit.vindex b/docs/USD.doc/edit/edit.vindex
index 2098f14ea190..2098f14ea190 100644
--- a/contrib/nvi/docs/USD.doc/edit/edit.vindex
+++ b/docs/USD.doc/edit/edit.vindex
diff --git a/contrib/nvi/docs/USD.doc/edit/edittut.ms b/docs/USD.doc/edit/edittut.ms
index 8a9d66ede2e6..8a9d66ede2e6 100644
--- a/contrib/nvi/docs/USD.doc/edit/edittut.ms
+++ b/docs/USD.doc/edit/edittut.ms
diff --git a/contrib/nvi/docs/USD.doc/exref/Makefile b/docs/USD.doc/exref/Makefile
index 11b5423607e7..11b5423607e7 100644
--- a/contrib/nvi/docs/USD.doc/exref/Makefile
+++ b/docs/USD.doc/exref/Makefile
diff --git a/contrib/nvi/docs/USD.doc/exref/ex.rm b/docs/USD.doc/exref/ex.rm
index 217bad46d277..217bad46d277 100644
--- a/contrib/nvi/docs/USD.doc/exref/ex.rm
+++ b/docs/USD.doc/exref/ex.rm
diff --git a/contrib/nvi/docs/USD.doc/exref/ex.summary b/docs/USD.doc/exref/ex.summary
index 83084a368ed8..83084a368ed8 100644
--- a/contrib/nvi/docs/USD.doc/exref/ex.summary
+++ b/docs/USD.doc/exref/ex.summary
diff --git a/contrib/nvi/docs/USD.doc/vi.man/Makefile b/docs/USD.doc/vi.man/Makefile
index 54338646791f..54338646791f 100644
--- a/contrib/nvi/docs/USD.doc/vi.man/Makefile
+++ b/docs/USD.doc/vi.man/Makefile
diff --git a/contrib/nvi/docs/USD.doc/vi.man/spell.ok b/docs/USD.doc/vi.man/spell.ok
index 80ebcaba829d..80ebcaba829d 100644
--- a/contrib/nvi/docs/USD.doc/vi.man/spell.ok
+++ b/docs/USD.doc/vi.man/spell.ok
diff --git a/contrib/nvi/docs/USD.doc/vi.man/vi.1 b/docs/USD.doc/vi.man/vi.1
index 22aee3e7e952..22aee3e7e952 100644
--- a/contrib/nvi/docs/USD.doc/vi.man/vi.1
+++ b/docs/USD.doc/vi.man/vi.1
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/Makefile b/docs/USD.doc/vi.ref/Makefile
index 0e1b6343350d..0e1b6343350d 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/Makefile
+++ b/docs/USD.doc/vi.ref/Makefile
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/ex.cmd.roff b/docs/USD.doc/vi.ref/ex.cmd.roff
index 382e635a6fdd..382e635a6fdd 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/ex.cmd.roff
+++ b/docs/USD.doc/vi.ref/ex.cmd.roff
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/index.so b/docs/USD.doc/vi.ref/index.so
index 4c3acb6e4f04..4c3acb6e4f04 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/index.so
+++ b/docs/USD.doc/vi.ref/index.so
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/merge.awk b/docs/USD.doc/vi.ref/merge.awk
index c65207c106a7..c65207c106a7 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/merge.awk
+++ b/docs/USD.doc/vi.ref/merge.awk
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/ref.so b/docs/USD.doc/vi.ref/ref.so
index a82c79258bb1..a82c79258bb1 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/ref.so
+++ b/docs/USD.doc/vi.ref/ref.so
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/set.opt.roff b/docs/USD.doc/vi.ref/set.opt.roff
index 838412897ab0..838412897ab0 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/set.opt.roff
+++ b/docs/USD.doc/vi.ref/set.opt.roff
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/spell.ok b/docs/USD.doc/vi.ref/spell.ok
index a7d95e35d03a..a7d95e35d03a 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/spell.ok
+++ b/docs/USD.doc/vi.ref/spell.ok
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/vi.cmd.roff b/docs/USD.doc/vi.ref/vi.cmd.roff
index 12030cd52b08..12030cd52b08 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/vi.cmd.roff
+++ b/docs/USD.doc/vi.ref/vi.cmd.roff
diff --git a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref b/docs/USD.doc/vi.ref/vi.ref
index a880c1659e11..a880c1659e11 100644
--- a/contrib/nvi/docs/USD.doc/vi.ref/vi.ref
+++ b/docs/USD.doc/vi.ref/vi.ref
diff --git a/contrib/nvi/docs/USD.doc/vitut/Makefile b/docs/USD.doc/vitut/Makefile
index 3d4aca0a64e6..3d4aca0a64e6 100644
--- a/contrib/nvi/docs/USD.doc/vitut/Makefile
+++ b/docs/USD.doc/vitut/Makefile
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.apwh.ms b/docs/USD.doc/vitut/vi.apwh.ms
index 6b0763055ca9..6b0763055ca9 100644
--- a/contrib/nvi/docs/USD.doc/vitut/vi.apwh.ms
+++ b/docs/USD.doc/vitut/vi.apwh.ms
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.chars b/docs/USD.doc/vitut/vi.chars
index 7941065d1d0f..7941065d1d0f 100644
--- a/contrib/nvi/docs/USD.doc/vitut/vi.chars
+++ b/docs/USD.doc/vitut/vi.chars
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.in b/docs/USD.doc/vitut/vi.in
index c36ebe41743e..c36ebe41743e 100644
--- a/contrib/nvi/docs/USD.doc/vitut/vi.in
+++ b/docs/USD.doc/vitut/vi.in
diff --git a/contrib/nvi/docs/USD.doc/vitut/vi.summary b/docs/USD.doc/vitut/vi.summary
index 8a09ce944407..8a09ce944407 100644
--- a/contrib/nvi/docs/USD.doc/vitut/vi.summary
+++ b/docs/USD.doc/vitut/vi.summary
diff --git a/contrib/nvi/docs/changelog b/docs/changelog
index 1f2a8c67b478..1f2a8c67b478 100644
--- a/contrib/nvi/docs/changelog
+++ b/docs/changelog
diff --git a/contrib/nvi/docs/ev b/docs/ev
index 144295a319f2..144295a319f2 100644
--- a/contrib/nvi/docs/ev
+++ b/docs/ev
diff --git a/contrib/nvi/docs/features b/docs/features
index 51650f949efc..51650f949efc 100644
--- a/contrib/nvi/docs/features
+++ b/docs/features
diff --git a/contrib/nvi/docs/help b/docs/help
index 81df84aa1353..81df84aa1353 100644
--- a/contrib/nvi/docs/help
+++ b/docs/help
diff --git a/contrib/nvi/docs/internals/autowrite b/docs/internals/autowrite
index dbad6c8bae8a..dbad6c8bae8a 100644
--- a/contrib/nvi/docs/internals/autowrite
+++ b/docs/internals/autowrite
diff --git a/contrib/nvi/docs/internals/context b/docs/internals/context
index 8b1db32768b7..8b1db32768b7 100644
--- a/contrib/nvi/docs/internals/context
+++ b/docs/internals/context
diff --git a/contrib/nvi/docs/internals/cscope.NOTES b/docs/internals/cscope.NOTES
index e0e3483d26ed..e0e3483d26ed 100644
--- a/contrib/nvi/docs/internals/cscope.NOTES
+++ b/docs/internals/cscope.NOTES
diff --git a/contrib/nvi/docs/internals/gdb.script b/docs/internals/gdb.script
index a1122343c162..a1122343c162 100644
--- a/contrib/nvi/docs/internals/gdb.script
+++ b/docs/internals/gdb.script
diff --git a/contrib/nvi/docs/internals/input b/docs/internals/input
index 9a7506ee2337..9a7506ee2337 100644
--- a/contrib/nvi/docs/internals/input
+++ b/docs/internals/input
diff --git a/contrib/nvi/docs/internals/openmode b/docs/internals/openmode
index c64b76774b3e..c64b76774b3e 100644
--- a/contrib/nvi/docs/internals/openmode
+++ b/docs/internals/openmode
diff --git a/contrib/nvi/docs/internals/quoting b/docs/internals/quoting
index a5fb8926a33c..a5fb8926a33c 100644
--- a/contrib/nvi/docs/internals/quoting
+++ b/docs/internals/quoting
diff --git a/contrib/nvi/docs/internals/structures b/docs/internals/structures
index a25c780c8e63..a25c780c8e63 100644
--- a/contrib/nvi/docs/internals/structures
+++ b/docs/internals/structures
diff --git a/contrib/nvi/docs/interp/interp b/docs/interp/interp
index 3da5a8f656dc..3da5a8f656dc 100644
--- a/contrib/nvi/docs/interp/interp
+++ b/docs/interp/interp
diff --git a/contrib/nvi/docs/interp/spell.ok b/docs/interp/spell.ok
index 4ca990c21720..4ca990c21720 100644
--- a/contrib/nvi/docs/interp/spell.ok
+++ b/docs/interp/spell.ok
diff --git a/contrib/nvi/docs/spell.ok b/docs/spell.ok
index ec854ffa41b4..ec854ffa41b4 100644
--- a/contrib/nvi/docs/spell.ok
+++ b/docs/spell.ok
diff --git a/contrib/nvi/docs/tutorial/vi.advanced b/docs/tutorial/vi.advanced
index f757ad19c44a..f757ad19c44a 100644
--- a/contrib/nvi/docs/tutorial/vi.advanced
+++ b/docs/tutorial/vi.advanced
diff --git a/contrib/nvi/docs/tutorial/vi.beginner b/docs/tutorial/vi.beginner
index 3bf35ac939f8..3bf35ac939f8 100644
--- a/contrib/nvi/docs/tutorial/vi.beginner
+++ b/docs/tutorial/vi.beginner
diff --git a/contrib/nvi/docs/tutorial/vi.tut.csh b/docs/tutorial/vi.tut.csh
index 01554bc4e5fd..01554bc4e5fd 100755
--- a/contrib/nvi/docs/tutorial/vi.tut.csh
+++ b/docs/tutorial/vi.tut.csh
diff --git a/contrib/nvi/ex/ex.awk b/ex/ex.awk
index 3ee372e14aac..3ee372e14aac 100644
--- a/contrib/nvi/ex/ex.awk
+++ b/ex/ex.awk
diff --git a/contrib/nvi/ex/ex.c b/ex/ex.c
index f92d8f7c4f9a..f92d8f7c4f9a 100644
--- a/contrib/nvi/ex/ex.c
+++ b/ex/ex.c
diff --git a/contrib/nvi/ex/ex.h b/ex/ex.h
index 5870990b744e..5870990b744e 100644
--- a/contrib/nvi/ex/ex.h
+++ b/ex/ex.h
diff --git a/contrib/nvi/ex/ex_abbrev.c b/ex/ex_abbrev.c
index 231098ce7d25..231098ce7d25 100644
--- a/contrib/nvi/ex/ex_abbrev.c
+++ b/ex/ex_abbrev.c
diff --git a/contrib/nvi/ex/ex_append.c b/ex/ex_append.c
index 8d89e125f51f..8d89e125f51f 100644
--- a/contrib/nvi/ex/ex_append.c
+++ b/ex/ex_append.c
diff --git a/contrib/nvi/ex/ex_args.c b/ex/ex_args.c
index bc37109fc130..bc37109fc130 100644
--- a/contrib/nvi/ex/ex_args.c
+++ b/ex/ex_args.c
diff --git a/contrib/nvi/ex/ex_argv.c b/ex/ex_argv.c
index cc5a201bea26..cc5a201bea26 100644
--- a/contrib/nvi/ex/ex_argv.c
+++ b/ex/ex_argv.c
diff --git a/contrib/nvi/ex/ex_at.c b/ex/ex_at.c
index e9c6c592d60b..e9c6c592d60b 100644
--- a/contrib/nvi/ex/ex_at.c
+++ b/ex/ex_at.c
diff --git a/contrib/nvi/ex/ex_bang.c b/ex/ex_bang.c
index 25f3f7732ab0..25f3f7732ab0 100644
--- a/contrib/nvi/ex/ex_bang.c
+++ b/ex/ex_bang.c
diff --git a/contrib/nvi/ex/ex_cd.c b/ex/ex_cd.c
index 3307c7b6306b..3307c7b6306b 100644
--- a/contrib/nvi/ex/ex_cd.c
+++ b/ex/ex_cd.c
diff --git a/contrib/nvi/ex/ex_cmd.c b/ex/ex_cmd.c
index 8f7fc8da7a13..8f7fc8da7a13 100644
--- a/contrib/nvi/ex/ex_cmd.c
+++ b/ex/ex_cmd.c
diff --git a/contrib/nvi/ex/ex_cscope.c b/ex/ex_cscope.c
index c2fa0a5c454b..c2fa0a5c454b 100644
--- a/contrib/nvi/ex/ex_cscope.c
+++ b/ex/ex_cscope.c
diff --git a/contrib/nvi/ex/ex_delete.c b/ex/ex_delete.c
index 58734bbcfce4..58734bbcfce4 100644
--- a/contrib/nvi/ex/ex_delete.c
+++ b/ex/ex_delete.c
diff --git a/contrib/nvi/ex/ex_display.c b/ex/ex_display.c
index 75315170f95e..75315170f95e 100644
--- a/contrib/nvi/ex/ex_display.c
+++ b/ex/ex_display.c
diff --git a/contrib/nvi/ex/ex_edit.c b/ex/ex_edit.c
index 8b18e0f0bbca..8b18e0f0bbca 100644
--- a/contrib/nvi/ex/ex_edit.c
+++ b/ex/ex_edit.c
diff --git a/contrib/nvi/ex/ex_equal.c b/ex/ex_equal.c
index 565df66bd0a9..565df66bd0a9 100644
--- a/contrib/nvi/ex/ex_equal.c
+++ b/ex/ex_equal.c
diff --git a/contrib/nvi/ex/ex_file.c b/ex/ex_file.c
index 3492f9c7bf0d..3492f9c7bf0d 100644
--- a/contrib/nvi/ex/ex_file.c
+++ b/ex/ex_file.c
diff --git a/contrib/nvi/ex/ex_filter.c b/ex/ex_filter.c
index 2e86e58b3ba2..2e86e58b3ba2 100644
--- a/contrib/nvi/ex/ex_filter.c
+++ b/ex/ex_filter.c
diff --git a/contrib/nvi/ex/ex_global.c b/ex/ex_global.c
index aba9dc5fabe3..aba9dc5fabe3 100644
--- a/contrib/nvi/ex/ex_global.c
+++ b/ex/ex_global.c
diff --git a/contrib/nvi/ex/ex_init.c b/ex/ex_init.c
index 6a78416a3344..6a78416a3344 100644
--- a/contrib/nvi/ex/ex_init.c
+++ b/ex/ex_init.c
diff --git a/contrib/nvi/ex/ex_join.c b/ex/ex_join.c
index c26c4243178a..c26c4243178a 100644
--- a/contrib/nvi/ex/ex_join.c
+++ b/ex/ex_join.c
diff --git a/contrib/nvi/ex/ex_map.c b/ex/ex_map.c
index bc2cf0855919..bc2cf0855919 100644
--- a/contrib/nvi/ex/ex_map.c
+++ b/ex/ex_map.c
diff --git a/contrib/nvi/ex/ex_mark.c b/ex/ex_mark.c
index 08ad8c2aa30b..08ad8c2aa30b 100644
--- a/contrib/nvi/ex/ex_mark.c
+++ b/ex/ex_mark.c
diff --git a/contrib/nvi/ex/ex_mkexrc.c b/ex/ex_mkexrc.c
index 0eb15d408cf7..0eb15d408cf7 100644
--- a/contrib/nvi/ex/ex_mkexrc.c
+++ b/ex/ex_mkexrc.c
diff --git a/contrib/nvi/ex/ex_move.c b/ex/ex_move.c
index d6e45c373964..d6e45c373964 100644
--- a/contrib/nvi/ex/ex_move.c
+++ b/ex/ex_move.c
diff --git a/contrib/nvi/ex/ex_open.c b/ex/ex_open.c
index afffaeb2202d..afffaeb2202d 100644
--- a/contrib/nvi/ex/ex_open.c
+++ b/ex/ex_open.c
diff --git a/contrib/nvi/ex/ex_perl.c b/ex/ex_perl.c
index e620352ab518..e620352ab518 100644
--- a/contrib/nvi/ex/ex_perl.c
+++ b/ex/ex_perl.c
diff --git a/contrib/nvi/ex/ex_preserve.c b/ex/ex_preserve.c
index 5614c88d753a..5614c88d753a 100644
--- a/contrib/nvi/ex/ex_preserve.c
+++ b/ex/ex_preserve.c
diff --git a/contrib/nvi/ex/ex_print.c b/ex/ex_print.c
index 4218e08e0978..4218e08e0978 100644
--- a/contrib/nvi/ex/ex_print.c
+++ b/ex/ex_print.c
diff --git a/contrib/nvi/ex/ex_put.c b/ex/ex_put.c
index 2facb03f0fb5..2facb03f0fb5 100644
--- a/contrib/nvi/ex/ex_put.c
+++ b/ex/ex_put.c
diff --git a/contrib/nvi/ex/ex_quit.c b/ex/ex_quit.c
index 705fa1a64ade..705fa1a64ade 100644
--- a/contrib/nvi/ex/ex_quit.c
+++ b/ex/ex_quit.c
diff --git a/contrib/nvi/ex/ex_read.c b/ex/ex_read.c
index 78296ff28ca6..78296ff28ca6 100644
--- a/contrib/nvi/ex/ex_read.c
+++ b/ex/ex_read.c
diff --git a/contrib/nvi/ex/ex_screen.c b/ex/ex_screen.c
index 9bc5bf04b06a..9bc5bf04b06a 100644
--- a/contrib/nvi/ex/ex_screen.c
+++ b/ex/ex_screen.c
diff --git a/contrib/nvi/ex/ex_script.c b/ex/ex_script.c
index 9ca6d60060d9..9ca6d60060d9 100644
--- a/contrib/nvi/ex/ex_script.c
+++ b/ex/ex_script.c
diff --git a/contrib/nvi/ex/ex_set.c b/ex/ex_set.c
index 11e929764242..11e929764242 100644
--- a/contrib/nvi/ex/ex_set.c
+++ b/ex/ex_set.c
diff --git a/contrib/nvi/ex/ex_shell.c b/ex/ex_shell.c
index 95168033a13f..95168033a13f 100644
--- a/contrib/nvi/ex/ex_shell.c
+++ b/ex/ex_shell.c
diff --git a/contrib/nvi/ex/ex_shift.c b/ex/ex_shift.c
index 83bd36d12a7d..83bd36d12a7d 100644
--- a/contrib/nvi/ex/ex_shift.c
+++ b/ex/ex_shift.c
diff --git a/contrib/nvi/ex/ex_source.c b/ex/ex_source.c
index b52c527716fd..b52c527716fd 100644
--- a/contrib/nvi/ex/ex_source.c
+++ b/ex/ex_source.c
diff --git a/contrib/nvi/ex/ex_stop.c b/ex/ex_stop.c
index bc55fd24ccb7..bc55fd24ccb7 100644
--- a/contrib/nvi/ex/ex_stop.c
+++ b/ex/ex_stop.c
diff --git a/contrib/nvi/ex/ex_subst.c b/ex/ex_subst.c
index 0ebb81dd58e7..0ebb81dd58e7 100644
--- a/contrib/nvi/ex/ex_subst.c
+++ b/ex/ex_subst.c
diff --git a/contrib/nvi/ex/ex_tag.c b/ex/ex_tag.c
index 461b1526ef00..461b1526ef00 100644
--- a/contrib/nvi/ex/ex_tag.c
+++ b/ex/ex_tag.c
diff --git a/contrib/nvi/ex/ex_tcl.c b/ex/ex_tcl.c
index 06736a781006..06736a781006 100644
--- a/contrib/nvi/ex/ex_tcl.c
+++ b/ex/ex_tcl.c
diff --git a/contrib/nvi/ex/ex_txt.c b/ex/ex_txt.c
index 2f62ff51a47c..2f62ff51a47c 100644
--- a/contrib/nvi/ex/ex_txt.c
+++ b/ex/ex_txt.c
diff --git a/contrib/nvi/ex/ex_undo.c b/ex/ex_undo.c
index 0b0b5b26be18..0b0b5b26be18 100644
--- a/contrib/nvi/ex/ex_undo.c
+++ b/ex/ex_undo.c
diff --git a/contrib/nvi/ex/ex_usage.c b/ex/ex_usage.c
index cddf7a6643c7..cddf7a6643c7 100644
--- a/contrib/nvi/ex/ex_usage.c
+++ b/ex/ex_usage.c
diff --git a/contrib/nvi/ex/ex_util.c b/ex/ex_util.c
index 6c4772e61540..6c4772e61540 100644
--- a/contrib/nvi/ex/ex_util.c
+++ b/ex/ex_util.c
diff --git a/contrib/nvi/ex/ex_version.c b/ex/ex_version.c
index d7363c8bd1ac..d7363c8bd1ac 100644
--- a/contrib/nvi/ex/ex_version.c
+++ b/ex/ex_version.c
diff --git a/contrib/nvi/ex/ex_visual.c b/ex/ex_visual.c
index 82e503d44658..82e503d44658 100644
--- a/contrib/nvi/ex/ex_visual.c
+++ b/ex/ex_visual.c
diff --git a/contrib/nvi/ex/ex_write.c b/ex/ex_write.c
index b3122e353563..b3122e353563 100644
--- a/contrib/nvi/ex/ex_write.c
+++ b/ex/ex_write.c
diff --git a/contrib/nvi/ex/ex_yank.c b/ex/ex_yank.c
index 778dc7dee62c..778dc7dee62c 100644
--- a/contrib/nvi/ex/ex_yank.c
+++ b/ex/ex_yank.c
diff --git a/contrib/nvi/ex/ex_z.c b/ex/ex_z.c
index 41b72ad1fd42..41b72ad1fd42 100644
--- a/contrib/nvi/ex/ex_z.c
+++ b/ex/ex_z.c
diff --git a/contrib/nvi/ex/script.h b/ex/script.h
index e29f63347961..e29f63347961 100644
--- a/contrib/nvi/ex/script.h
+++ b/ex/script.h
diff --git a/contrib/nvi/ex/tag.h b/ex/tag.h
index aee3dd27471d..aee3dd27471d 100644
--- a/contrib/nvi/ex/tag.h
+++ b/ex/tag.h
diff --git a/contrib/nvi/ex/version.h b/ex/version.h
index 7d657b635fc2..7d657b635fc2 100644
--- a/contrib/nvi/ex/version.h
+++ b/ex/version.h
diff --git a/contrib/nvi/include/bitstring.h b/include/bitstring.h
index 88437e7fb9f7..88437e7fb9f7 100644
--- a/contrib/nvi/include/bitstring.h
+++ b/include/bitstring.h
diff --git a/contrib/nvi/include/cl_extern.h b/include/cl_extern.h
index bafeb944e969..bafeb944e969 100644
--- a/contrib/nvi/include/cl_extern.h
+++ b/include/cl_extern.h
diff --git a/contrib/nvi/include/com_extern.h b/include/com_extern.h
index f140f9e34232..f140f9e34232 100644
--- a/contrib/nvi/include/com_extern.h
+++ b/include/com_extern.h
diff --git a/contrib/nvi/include/ex_def.h b/include/ex_def.h
index 2e69b4872f59..2e69b4872f59 100644
--- a/contrib/nvi/include/ex_def.h
+++ b/include/ex_def.h
diff --git a/contrib/nvi/include/ex_extern.h b/include/ex_extern.h
index ed01701f1185..ed01701f1185 100644
--- a/contrib/nvi/include/ex_extern.h
+++ b/include/ex_extern.h
diff --git a/contrib/nvi/include/ip_extern.h b/include/ip_extern.h
index b805343a8e81..b805343a8e81 100644
--- a/contrib/nvi/include/ip_extern.h
+++ b/include/ip_extern.h
diff --git a/contrib/nvi/include/options_def.h b/include/options_def.h
index 089fa7f4ea4c..089fa7f4ea4c 100644
--- a/contrib/nvi/include/options_def.h
+++ b/include/options_def.h
diff --git a/contrib/nvi/include/perl_extern.h b/include/perl_extern.h
index 5d6dd0d33bb6..5d6dd0d33bb6 100644
--- a/contrib/nvi/include/perl_extern.h
+++ b/include/perl_extern.h
diff --git a/contrib/nvi/include/sys/queue.h b/include/sys/queue.h
index cbd75864ecda..cbd75864ecda 100644
--- a/contrib/nvi/include/sys/queue.h
+++ b/include/sys/queue.h
diff --git a/contrib/nvi/include/tcl_extern.h b/include/tcl_extern.h
index ac68ae4119fd..ac68ae4119fd 100644
--- a/contrib/nvi/include/tcl_extern.h
+++ b/include/tcl_extern.h
diff --git a/contrib/nvi/include/tk_extern.h b/include/tk_extern.h
index 20a4de459f5e..20a4de459f5e 100644
--- a/contrib/nvi/include/tk_extern.h
+++ b/include/tk_extern.h
diff --git a/contrib/nvi/include/vi_extern.h b/include/vi_extern.h
index b3c335e6c580..b3c335e6c580 100644
--- a/contrib/nvi/include/vi_extern.h
+++ b/include/vi_extern.h
diff --git a/contrib/nvi/ip/IP_INSTRUCTIONS b/ip/IP_INSTRUCTIONS
index 7745c8858d6f..7745c8858d6f 100644
--- a/contrib/nvi/ip/IP_INSTRUCTIONS
+++ b/ip/IP_INSTRUCTIONS
diff --git a/contrib/nvi/ip/ip.h b/ip/ip.h
index f7798c3121b4..f7798c3121b4 100644
--- a/contrib/nvi/ip/ip.h
+++ b/ip/ip.h
diff --git a/contrib/nvi/ip/ip_funcs.c b/ip/ip_funcs.c
index c92f1eda2439..c92f1eda2439 100644
--- a/contrib/nvi/ip/ip_funcs.c
+++ b/ip/ip_funcs.c
diff --git a/contrib/nvi/ip/ip_main.c b/ip/ip_main.c
index 7ca9f55024fd..7ca9f55024fd 100644
--- a/contrib/nvi/ip/ip_main.c
+++ b/ip/ip_main.c
diff --git a/contrib/nvi/ip/ip_read.c b/ip/ip_read.c
index 9fd977774173..9fd977774173 100644
--- a/contrib/nvi/ip/ip_read.c
+++ b/ip/ip_read.c
diff --git a/contrib/nvi/ip/ip_screen.c b/ip/ip_screen.c
index 71578e0d1b39..71578e0d1b39 100644
--- a/contrib/nvi/ip/ip_screen.c
+++ b/ip/ip_screen.c
diff --git a/contrib/nvi/ip/ip_term.c b/ip/ip_term.c
index 28e686dddd28..28e686dddd28 100644
--- a/contrib/nvi/ip/ip_term.c
+++ b/ip/ip_term.c
diff --git a/contrib/nvi/ip_cl/Makefile b/ip_cl/Makefile
index 9503c4dac501..9503c4dac501 100644
--- a/contrib/nvi/ip_cl/Makefile
+++ b/ip_cl/Makefile
diff --git a/contrib/nvi/ip_cl/ip_cl.c b/ip_cl/ip_cl.c
index 5137b3f56abc..5137b3f56abc 100644
--- a/contrib/nvi/ip_cl/ip_cl.c
+++ b/ip_cl/ip_cl.c
diff --git a/contrib/nvi/perl_api/VI.pod b/perl_api/VI.pod
index a87e24d911d8..a87e24d911d8 100644
--- a/contrib/nvi/perl_api/VI.pod
+++ b/perl_api/VI.pod
diff --git a/contrib/nvi/perl_api/nviperl.pod b/perl_api/nviperl.pod
index 43850d8b6363..43850d8b6363 100644
--- a/contrib/nvi/perl_api/nviperl.pod
+++ b/perl_api/nviperl.pod
diff --git a/contrib/nvi/perl_api/perl.xs b/perl_api/perl.xs
index 0b48cded5bfc..0b48cded5bfc 100644
--- a/contrib/nvi/perl_api/perl.xs
+++ b/perl_api/perl.xs
diff --git a/contrib/nvi/perl_api/perlsfio.c b/perl_api/perlsfio.c
index 20ff4773495a..20ff4773495a 100644
--- a/contrib/nvi/perl_api/perlsfio.c
+++ b/perl_api/perlsfio.c
diff --git a/contrib/nvi/perl_api/typemap b/perl_api/typemap
index 0e38a9c07bc7..0e38a9c07bc7 100644
--- a/contrib/nvi/perl_api/typemap
+++ b/perl_api/typemap
diff --git a/contrib/nvi/perl_scripts/forall.pl b/perl_scripts/forall.pl
index b9f85013b17d..b9f85013b17d 100644
--- a/contrib/nvi/perl_scripts/forall.pl
+++ b/perl_scripts/forall.pl
diff --git a/contrib/nvi/perl_scripts/make.pl b/perl_scripts/make.pl
index 118dd99a424c..118dd99a424c 100644
--- a/contrib/nvi/perl_scripts/make.pl
+++ b/perl_scripts/make.pl
diff --git a/contrib/nvi/perl_scripts/tk.pl b/perl_scripts/tk.pl
index f8d1bc068df3..f8d1bc068df3 100644
--- a/contrib/nvi/perl_scripts/tk.pl
+++ b/perl_scripts/tk.pl
diff --git a/contrib/nvi/perl_scripts/wc.pl b/perl_scripts/wc.pl
index 0a5015987d10..0a5015987d10 100644
--- a/contrib/nvi/perl_scripts/wc.pl
+++ b/perl_scripts/wc.pl
diff --git a/contrib/nvi/tcl_api/tcl.c b/tcl_api/tcl.c
index 8f4a430bac4c..8f4a430bac4c 100644
--- a/contrib/nvi/tcl_api/tcl.c
+++ b/tcl_api/tcl.c
diff --git a/contrib/nvi/tcl_scripts/errors.tcl b/tcl_scripts/errors.tcl
index 94a1e6a8c3c9..94a1e6a8c3c9 100644
--- a/contrib/nvi/tcl_scripts/errors.tcl
+++ b/tcl_scripts/errors.tcl
diff --git a/contrib/nvi/tcl_scripts/gnats.tcl b/tcl_scripts/gnats.tcl
index 61ecb6e2cda0..61ecb6e2cda0 100644
--- a/contrib/nvi/tcl_scripts/gnats.tcl
+++ b/tcl_scripts/gnats.tcl
diff --git a/contrib/nvi/tcl_scripts/mailprocs.tcl b/tcl_scripts/mailprocs.tcl
index eccb9cdfcf74..eccb9cdfcf74 100644
--- a/contrib/nvi/tcl_scripts/mailprocs.tcl
+++ b/tcl_scripts/mailprocs.tcl
diff --git a/contrib/nvi/tcl_scripts/wc.tcl b/tcl_scripts/wc.tcl
index 25d0f6254391..25d0f6254391 100644
--- a/contrib/nvi/tcl_scripts/wc.tcl
+++ b/tcl_scripts/wc.tcl
diff --git a/contrib/nvi/tk/init.tcl b/tk/init.tcl
index 78c5a115c0a7..78c5a115c0a7 100644
--- a/contrib/nvi/tk/init.tcl
+++ b/tk/init.tcl
diff --git a/contrib/nvi/tk/tk_funcs.c b/tk/tk_funcs.c
index be2b0d96ea09..be2b0d96ea09 100644
--- a/contrib/nvi/tk/tk_funcs.c
+++ b/tk/tk_funcs.c
diff --git a/contrib/nvi/tk/tk_main.c b/tk/tk_main.c
index c2f34e7b2d9f..c2f34e7b2d9f 100644
--- a/contrib/nvi/tk/tk_main.c
+++ b/tk/tk_main.c
diff --git a/contrib/nvi/tk/tk_read.c b/tk/tk_read.c
index b5cfab71c7e2..b5cfab71c7e2 100644
--- a/contrib/nvi/tk/tk_read.c
+++ b/tk/tk_read.c
diff --git a/contrib/nvi/tk/tk_screen.c b/tk/tk_screen.c
index e1090930ba23..e1090930ba23 100644
--- a/contrib/nvi/tk/tk_screen.c
+++ b/tk/tk_screen.c
diff --git a/contrib/nvi/tk/tk_term.c b/tk/tk_term.c
index 18299a28ae77..18299a28ae77 100644
--- a/contrib/nvi/tk/tk_term.c
+++ b/tk/tk_term.c
diff --git a/contrib/nvi/tk/tk_util.c b/tk/tk_util.c
index 096fa7bb3eba..096fa7bb3eba 100644
--- a/contrib/nvi/tk/tk_util.c
+++ b/tk/tk_util.c
diff --git a/contrib/nvi/tk/tki.h b/tk/tki.h
index 206dacf5d73b..206dacf5d73b 100644
--- a/contrib/nvi/tk/tki.h
+++ b/tk/tki.h
diff --git a/contrib/nvi/vi/getc.c b/vi/getc.c
index 5e60adee96d7..5e60adee96d7 100644
--- a/contrib/nvi/vi/getc.c
+++ b/vi/getc.c
diff --git a/contrib/nvi/vi/v_at.c b/vi/v_at.c
index d266f275d983..d266f275d983 100644
--- a/contrib/nvi/vi/v_at.c
+++ b/vi/v_at.c
diff --git a/contrib/nvi/vi/v_ch.c b/vi/v_ch.c
index 6a1b61182680..6a1b61182680 100644
--- a/contrib/nvi/vi/v_ch.c
+++ b/vi/v_ch.c
diff --git a/contrib/nvi/vi/v_cmd.c b/vi/v_cmd.c
index cc9e30f79ae4..cc9e30f79ae4 100644
--- a/contrib/nvi/vi/v_cmd.c
+++ b/vi/v_cmd.c
diff --git a/contrib/nvi/vi/v_delete.c b/vi/v_delete.c
index 70df78b22e2c..70df78b22e2c 100644
--- a/contrib/nvi/vi/v_delete.c
+++ b/vi/v_delete.c
diff --git a/contrib/nvi/vi/v_ex.c b/vi/v_ex.c
index 359080c656e3..359080c656e3 100644
--- a/contrib/nvi/vi/v_ex.c
+++ b/vi/v_ex.c
diff --git a/contrib/nvi/vi/v_increment.c b/vi/v_increment.c
index 45e763fa5bd5..45e763fa5bd5 100644
--- a/contrib/nvi/vi/v_increment.c
+++ b/vi/v_increment.c
diff --git a/contrib/nvi/vi/v_init.c b/vi/v_init.c
index ee58de377ada..ee58de377ada 100644
--- a/contrib/nvi/vi/v_init.c
+++ b/vi/v_init.c
diff --git a/contrib/nvi/vi/v_itxt.c b/vi/v_itxt.c
index 6cf93773ac3d..6cf93773ac3d 100644
--- a/contrib/nvi/vi/v_itxt.c
+++ b/vi/v_itxt.c
diff --git a/contrib/nvi/vi/v_left.c b/vi/v_left.c
index cfed80c74bf4..cfed80c74bf4 100644
--- a/contrib/nvi/vi/v_left.c
+++ b/vi/v_left.c
diff --git a/contrib/nvi/vi/v_mark.c b/vi/v_mark.c
index 447430efabe8..447430efabe8 100644
--- a/contrib/nvi/vi/v_mark.c
+++ b/vi/v_mark.c
diff --git a/contrib/nvi/vi/v_match.c b/vi/v_match.c
index 3996560aaa73..3996560aaa73 100644
--- a/contrib/nvi/vi/v_match.c
+++ b/vi/v_match.c
diff --git a/contrib/nvi/vi/v_paragraph.c b/vi/v_paragraph.c
index 762e38e01671..762e38e01671 100644
--- a/contrib/nvi/vi/v_paragraph.c
+++ b/vi/v_paragraph.c
diff --git a/contrib/nvi/vi/v_put.c b/vi/v_put.c
index 77220ea14ff9..77220ea14ff9 100644
--- a/contrib/nvi/vi/v_put.c
+++ b/vi/v_put.c
diff --git a/contrib/nvi/vi/v_redraw.c b/vi/v_redraw.c
index 4c965c713913..4c965c713913 100644
--- a/contrib/nvi/vi/v_redraw.c
+++ b/vi/v_redraw.c
diff --git a/contrib/nvi/vi/v_replace.c b/vi/v_replace.c
index a4712b683a91..a4712b683a91 100644
--- a/contrib/nvi/vi/v_replace.c
+++ b/vi/v_replace.c
diff --git a/contrib/nvi/vi/v_right.c b/vi/v_right.c
index c2f349eb2328..c2f349eb2328 100644
--- a/contrib/nvi/vi/v_right.c
+++ b/vi/v_right.c
diff --git a/contrib/nvi/vi/v_screen.c b/vi/v_screen.c
index 85cd1e32bca0..85cd1e32bca0 100644
--- a/contrib/nvi/vi/v_screen.c
+++ b/vi/v_screen.c
diff --git a/contrib/nvi/vi/v_scroll.c b/vi/v_scroll.c
index 92def4b3e48d..92def4b3e48d 100644
--- a/contrib/nvi/vi/v_scroll.c
+++ b/vi/v_scroll.c
diff --git a/contrib/nvi/vi/v_search.c b/vi/v_search.c
index 4f7a2671ab8e..4f7a2671ab8e 100644
--- a/contrib/nvi/vi/v_search.c
+++ b/vi/v_search.c
diff --git a/contrib/nvi/vi/v_section.c b/vi/v_section.c
index 20e8ff2808fd..20e8ff2808fd 100644
--- a/contrib/nvi/vi/v_section.c
+++ b/vi/v_section.c
diff --git a/contrib/nvi/vi/v_sentence.c b/vi/v_sentence.c
index a3d9376be403..a3d9376be403 100644
--- a/contrib/nvi/vi/v_sentence.c
+++ b/vi/v_sentence.c
diff --git a/contrib/nvi/vi/v_status.c b/vi/v_status.c
index 7095d782c60a..7095d782c60a 100644
--- a/contrib/nvi/vi/v_status.c
+++ b/vi/v_status.c
diff --git a/contrib/nvi/vi/v_txt.c b/vi/v_txt.c
index c47a485686fb..c47a485686fb 100644
--- a/contrib/nvi/vi/v_txt.c
+++ b/vi/v_txt.c
diff --git a/contrib/nvi/vi/v_ulcase.c b/vi/v_ulcase.c
index 179bebabcc11..179bebabcc11 100644
--- a/contrib/nvi/vi/v_ulcase.c
+++ b/vi/v_ulcase.c
diff --git a/contrib/nvi/vi/v_undo.c b/vi/v_undo.c
index d04a8a18810b..d04a8a18810b 100644
--- a/contrib/nvi/vi/v_undo.c
+++ b/vi/v_undo.c
diff --git a/contrib/nvi/vi/v_util.c b/vi/v_util.c
index c4c0daa901fd..c4c0daa901fd 100644
--- a/contrib/nvi/vi/v_util.c
+++ b/vi/v_util.c
diff --git a/contrib/nvi/vi/v_word.c b/vi/v_word.c
index e6e4a63c57e7..e6e4a63c57e7 100644
--- a/contrib/nvi/vi/v_word.c
+++ b/vi/v_word.c
diff --git a/contrib/nvi/vi/v_xchar.c b/vi/v_xchar.c
index 15f155ffed33..15f155ffed33 100644
--- a/contrib/nvi/vi/v_xchar.c
+++ b/vi/v_xchar.c
diff --git a/contrib/nvi/vi/v_yank.c b/vi/v_yank.c
index 4708f1996774..4708f1996774 100644
--- a/contrib/nvi/vi/v_yank.c
+++ b/vi/v_yank.c
diff --git a/contrib/nvi/vi/v_z.c b/vi/v_z.c
index 5f02ddf5a10b..5f02ddf5a10b 100644
--- a/contrib/nvi/vi/v_z.c
+++ b/vi/v_z.c
diff --git a/contrib/nvi/vi/v_zexit.c b/vi/v_zexit.c
index 3e454caa5bea..3e454caa5bea 100644
--- a/contrib/nvi/vi/v_zexit.c
+++ b/vi/v_zexit.c
diff --git a/contrib/nvi/vi/vi.c b/vi/vi.c
index d20f7f284e39..d20f7f284e39 100644
--- a/contrib/nvi/vi/vi.c
+++ b/vi/vi.c
diff --git a/contrib/nvi/vi/vi.h b/vi/vi.h
index bede3a651817..bede3a651817 100644
--- a/contrib/nvi/vi/vi.h
+++ b/vi/vi.h
diff --git a/contrib/nvi/vi/vs_line.c b/vi/vs_line.c
index 2e5166227b35..2e5166227b35 100644
--- a/contrib/nvi/vi/vs_line.c
+++ b/vi/vs_line.c
diff --git a/contrib/nvi/vi/vs_msg.c b/vi/vs_msg.c
index 7ef8f5343c15..7ef8f5343c15 100644
--- a/contrib/nvi/vi/vs_msg.c
+++ b/vi/vs_msg.c
diff --git a/contrib/nvi/vi/vs_refresh.c b/vi/vs_refresh.c
index 81587608c1a2..81587608c1a2 100644
--- a/contrib/nvi/vi/vs_refresh.c
+++ b/vi/vs_refresh.c
diff --git a/contrib/nvi/vi/vs_relative.c b/vi/vs_relative.c
index 878fc4f944ad..878fc4f944ad 100644
--- a/contrib/nvi/vi/vs_relative.c
+++ b/vi/vs_relative.c
diff --git a/contrib/nvi/vi/vs_smap.c b/vi/vs_smap.c
index 18d7942b742a..18d7942b742a 100644
--- a/contrib/nvi/vi/vs_smap.c
+++ b/vi/vs_smap.c
diff --git a/contrib/nvi/vi/vs_split.c b/vi/vs_split.c
index d01735490e69..d01735490e69 100644
--- a/contrib/nvi/vi/vs_split.c
+++ b/vi/vs_split.c