misc: UNIX => Unix #4022

Although UNIX is a registered trademark of The Open Group, it doesn't
really matter whether we refer to these systems as UNIX, Unix, or
Unix-like. So, for consistency, refer to them collectively as Unix.

Related:
http://www.greens.org/about/unix.html
http://www.unixica.com/html/unixunix.html

23 files changed, 55 insertions, 61 deletions

diff --git a/clint.py b/clint.py
index d507837e58..9f6a35b7f4 100755
--- a/clint.py
+++ b/clint.py
@@ -3316,7 +3316,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=[]):
     _SetVerboseLevel(vlevel)
 
     try:
-        # Support the UNIX convention of using "-" for stdin.  Note that
+        # Support the Unix convention of using "-" for stdin.  Note that
         # we are not opening the file with universal newline support
         # (which codecs doesn't support anyway), so the resulting lines do
         # contain trailing '\r' characters if we are reading a file that
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 48ecc9cc33..1dcf7e4686 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -24,7 +24,7 @@ check_include_files(strings.h HAVE_STRINGS_H)
 check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
 if(NOT HAVE_SYS_WAIT_H AND UNIX)
   # See if_cscope.c
-  message(SEND_ERROR "header sys/wait.h is required for UNIX")
+  message(SEND_ERROR "header sys/wait.h is required for Unix")
 endif()
 check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
 check_include_files(utime.h HAVE_UTIME_H)
diff --git a/man/nvim.1 b/man/nvim.1
index 968da04d52..f9c4e24d0b 100644
--- a/man/nvim.1
+++ b/man/nvim.1
@@ -75,7 +75,7 @@ Can be used to edit files starting with a hyphen
 .Pq Sq - .
 .It Fl -literal
 Interpret filenames literally, that is, do not expand wildcards.
-Has no effect on UNIX-like systems, where the shell expands wildcards.
+Has no effect on Unix-like systems, where the shell expands wildcards.
 .It Fl e
 Ex mode.
 See
diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt
index 6036264237..b85c0a357c 100644
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -111,7 +111,7 @@ The letter encoding used is the Vim extended ISIR-3342 standard with a built
 in function to convert between Vim extended ISIR-3342 and ISIR-3342 standard.
 
 For document portability reasons, the letter encoding is kept the same across
-different platforms (i.e. UNIX's, NT/95/98, MS DOS, ...).
+different platforms (i.e. Unix, Windows, ...).
 
 
 o  Keyboard
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index baf7550948..b6525e8494 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -595,7 +595,7 @@ Format description:
    ignored.
 2. Each entry starts with line that has format "{type} with timestamp 
    {timestamp}:". {timestamp} is |strftime()|-formatted string representing 
-   actual UNIX timestamp value. First strftime() argument is equal to 
+   actual Unix timestamp value. First strftime() argument is equal to
    `%Y-%m-%dT%H:%M:%S`.  When writing this timestamp is parsed using 
    |msgpack#strptime()|, with caching (it remembers which timestamp produced 
    particular strftime() output and uses this value if you did not change 
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 431b6e1ad7..fdf106a7bb 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -251,7 +251,7 @@ Vim would never have become what it is now, without the help of these people!
 				lots of patches
 	Ingo Wilken		Tcl interface
 	Mike Williams		PostScript printing
-	Juergen Weigert		Lattice version, AUX improvements, UNIX and
+	Juergen Weigert		Lattice version, AUX improvements, Unix and
 				MS-DOS ports, autoconf
 	Stefan 'Sec' Zehl	Maintainer of vim.org
 
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 156b3d9bfc..21eeb9bc41 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1084,7 +1084,7 @@ x	A single character, with no special meaning, matches itself
 *[:backspace:]*		  [:backspace:]	the <BS> character
 	  The brackets in character class expressions are additional to the
 	  brackets delimiting a collection.  For example, the following is a
-	  plausible pattern for a UNIX filename: "[-./[:alnum:]_~]\+" That is,
+	  plausible pattern for a Unix filename: "[-./[:alnum:]_~]\+" That is,
 	  a list of at least one character, each of which is either '-', '.',
 	  '/', alphabetic, numeric, '_' or '~'.
 	  These items only work for 8-bit characters.
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index aad69dee1d..f81a4e3a2c 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -78,7 +78,7 @@ mistakes; you can correct them later.  To enter the following programmer's
 limerick, this is what you type: >
 
 	iA very intelligent turtle
-	Found programming UNIX a hurdle
+	Found programming Unix a hurdle
 
 After typing "turtle" you press the <Enter> key to start a new line.  Finally
 you press the <Esc> key to stop Insert mode and go back to Normal mode.  You
@@ -86,7 +86,7 @@ now have two lines of text in your Vim window:
 
 	+---------------------------------------+
 	|A very intelligent turtle		|
-	|Found programming UNIX a hurdle	|
+	|Found programming Unix a hurdle	|
 	|~					|
 	|~					|
 	|					|
@@ -108,7 +108,7 @@ of the window.  This indicates you are in Insert mode.
 
 	+---------------------------------------+
 	|A very intelligent turtle		|
-	|Found programming UNIX a hurdle	|
+	|Found programming Unix a hurdle	|
 	|~					|
 	|~					|
 	|-- INSERT --				|
@@ -185,7 +185,7 @@ look like this:
 
 	+---------------------------------------+
 	|intelligent turtle			|
-	|Found programming UNIX a hurdle	|
+	|Found programming Unix a hurdle	|
 	|~					|
 	|~					|
 	|					|
@@ -200,7 +200,7 @@ insert mode (the final <Esc>).	The result:
 
 	+---------------------------------------+
 	|A young intelligent turtle		|
-	|Found programming UNIX a hurdle	|
+	|Found programming Unix a hurdle	|
 	|~					|
 	|~					|
 	|					|
@@ -213,7 +213,7 @@ To delete a whole line use the "dd" command.  The following line will
 then move up to fill the gap:
 
 	+---------------------------------------+
-	|Found programming UNIX a hurdle	|
+	|Found programming Unix a hurdle	|
 	|~					|
 	|~					|
 	|~					|
@@ -330,7 +330,7 @@ Insert mode.  Then you can type the text for the new line.
    Suppose the cursor is somewhere in the first of these two lines:
 
 	A very intelligent turtle ~
-	Found programming UNIX a hurdle ~
+	Found programming Unix a hurdle ~
 
 If you now use the "o" command and type new text: >
 
@@ -340,7 +340,7 @@ The result is:
 
 	A very intelligent turtle ~
 	That liked using Vim ~
-	Found programming UNIX a hurdle ~
+	Found programming Unix a hurdle ~
 
 The "O" command (uppercase) opens a line above the cursor.
 
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index 05cc32bceb..d68d734b8f 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -134,10 +134,10 @@ The following command makes the mouse work like a Microsoft Windows mouse: >
 
 	:behave mswin
 
-The default behavior of the mouse on UNIX systems is xterm.  The default
-behavior on a Microsoft Windows system is selected during the installation
-process.  For details about what the two behaviors are, see |:behave|.  Here
-follows a summary.
+The default behavior of the mouse on Unix systems is xterm.  The default
+behavior on Windows systems is selected during the installation process.  For
+details about what the two behaviors are, see |:behave|.  Here follows a
+summary.
 
 
 XTERM MOUSE BEHAVIOR
diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
index 64b0181c35..bf7ba18222 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -698,10 +698,10 @@ still be something that an external command can do better or faster.
 through an external program.  In other words, it runs the system command
 represented by {program}, giving it the block of text represented by {motion}
 as input.  The output of this command then replaces the selected block.
-   Because this summarizes badly if you are unfamiliar with UNIX filters, take
+   Because this summarizes badly if you are unfamiliar with Unix filters, take
 a look at an example.  The sort command sorts a file.  If you execute the
 following command, the unsorted file input.txt will be sorted and written to
-output.txt.  (This works on both UNIX and Microsoft Windows.) >
+output.txt.  This works on both Unix and Windows. >
 
 	sort <input.txt >output.txt
 
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
index fba1b53274..237abae55f 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -309,7 +309,7 @@ matches can be found.
 ==============================================================================
 *12.8*	Find where a word is used
 
-If you are a UNIX user, you can use a combination of Vim and the grep command
+If you are a Unix user, you can use a combination of Vim and the grep command
 to edit all the files that contain a given word.  This is extremely useful if
 you are working on a program and want to view or edit all the files that
 contain a specific variable.
@@ -324,7 +324,7 @@ will only list the files containing the word and not print the matching lines.
 The word it is searching for is "frame_counter".  Actually, this can be any
 regular expression.  (Note: What grep uses for regular expressions is not
 exactly the same as what Vim uses.)
-   The entire command is enclosed in backticks (`).  This tells the UNIX shell
+   The entire command is enclosed in backticks (`).  This tells the Unix shell
 to run this command and pretend that the results were typed on the command
 line.  So what happens is that the grep command is run and produces a list of
 files, these files are put on the Vim command line.  This results in Vim
diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt
index 8f783ee27b..4761203512 100644
--- a/runtime/doc/usr_23.txt
+++ b/runtime/doc/usr_23.txt
@@ -25,7 +25,7 @@ Back in the early days, the old Teletype machines used two characters to
 start a new line.  One to move the carriage back to the first position
 (carriage return, <CR>), another to move the paper up (line feed, <LF>).
    When computers came out, storage was expensive.  Some people decided that
-they did not need two characters for end-of-line.  The UNIX people decided
+they did not need two characters for end-of-line.  The Unix people decided
 they could use <Line Feed> only for end-of-line.  The Apple people
 standardized on <CR>.  The MS-DOS (and Microsoft Windows) folks decided to
 keep the old <CR><LF>.
@@ -97,12 +97,12 @@ CONVERSION
 
 You can use the 'fileformat' option to convert from one file format to
 another.  Suppose, for example, that you have an MS-DOS file named README.TXT
-that you want to convert to UNIX format.  Start by editing the MS-DOS format
+that you want to convert to Unix format.  Start by editing the MS-DOS format
 file: >
 	vim README.TXT
 
 Vim will recognize this as a dos format file.  Now change the file format to
-UNIX: >
+Unix: >
 
 	:set fileformat=unix
 	:write
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 34c25589d4..29d87d0fc1 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -951,30 +951,26 @@ void do_bang(int addr_count, exarg_T *eap, int forceit, int do_in, int do_out)
     xfree(newcmd);
 }
 
-/*
- * do_filter: filter lines through a command given by the user
- *
- * We mostly use temp files and the call_shell() routine here. This would
- * normally be done using pipes on a UNIX machine, but this is more portable
- * to non-unix machines. The call_shell() routine needs to be able
- * to deal with redirection somehow, and should handle things like looking
- * at the PATH env. variable, and adding reasonable extensions to the
- * command name given by the user. All reasonable versions of call_shell()
- * do this.
- * Alternatively, if on Unix and redirecting input or output, but not both,
- * and the 'shelltemp' option isn't set, use pipes.
- * We use input redirection if do_in is TRUE.
- * We use output redirection if do_out is TRUE.
- */
-static void 
-do_filter (
+// do_filter: filter lines through a command given by the user
+//
+// We mostly use temp files and the call_shell() routine here. This would
+// normally be done using pipes on a Unix system, but this is more portable
+// to non-Unix systems. The call_shell() routine needs to be able
+// to deal with redirection somehow, and should handle things like looking
+// at the PATH env. variable, and adding reasonable extensions to the
+// command name given by the user. All reasonable versions of call_shell()
+// do this.
+// Alternatively, if on Unix and redirecting input or output, but not both,
+// and the 'shelltemp' option isn't set, use pipes.
+// We use input redirection if do_in is TRUE.
+// We use output redirection if do_out is TRUE.
+static void do_filter(
     linenr_T line1,
     linenr_T line2,
     exarg_T *eap,               /* for forced 'ff' and 'fenc' */
     char_u *cmd,
     int do_in,
-    int do_out
-)
+    int do_out)
 {
   char_u      *itmp = NULL;
   char_u      *otmp = NULL;
@@ -1690,7 +1686,7 @@ check_overwrite (
              && os_file_exists(ffname)) {
     if (!eap->forceit && !eap->append) {
 #ifdef UNIX
-      /* with UNIX it is possible to open a directory */
+      // It is possible to open a directory on Unix.
       if (os_isdir(ffname)) {
         EMSG2(_(e_isadir2), ffname);
         return FAIL;
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 84bd31d9ad..cbe7c1a231 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -6843,9 +6843,9 @@ void ex_cd(exarg_T *eap)
       prev_dir = NULL;
 
 #if defined(UNIX)
-    /* for UNIX ":cd" means: go to home directory */
+    // On Unix ":cd" means: go to home directory.
     if (*new_dir == NUL) {
-      /* use NameBuff for home directory name */
+      // Use NameBuff for home directory name.
       expand_env((char_u *)"$HOME", NameBuff, MAXPATHL);
       new_dir = NameBuff;
     }
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 6d81f3680a..eca62da949 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -596,7 +596,7 @@ static int command_line_execute(VimState *state, int key)
       }
 
       if (s->j > 0) {
-        // TODO(tarruda): this is only for DOS/UNIX systems - need to put in
+        // TODO(tarruda): this is only for DOS/Unix systems - need to put in
         // machine-specific stuff here and in upseg init
         cmdline_del(s->j);
         put_on_cmdline(upseg + 1, 3, false);
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index cd206e2e0d..2a766734fe 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -1841,9 +1841,7 @@ static void sig_handler(int s) {
  */
 static void cs_release_csp(size_t i, int freefnpp)
 {
-  /*
-   * Trying to exit normally (not sure whether it is fit to UNIX cscope
-   */
+  // Trying to exit normally (not sure whether it is fit to Unix cscope)
   if (csinfo[i].to_fp != NULL) {
     (void)fputs("q\n", csinfo[i].to_fp);
     (void)fflush(csinfo[i].to_fp);
diff --git a/src/nvim/os/dl.c b/src/nvim/os/dl.c
index b4a35e203e..fef02cc784 100644
--- a/src/nvim/os/dl.c
+++ b/src/nvim/os/dl.c
@@ -63,7 +63,7 @@ bool os_libcall(const char *libname,
 
   // call the library and save the result
   // TODO(aktau): catch signals and use jmp (if available) to handle
-  // exceptions. jmp's on UNIX seem to interact trickily with signals as
+  // exceptions. jmp's on Unix seem to interact trickily with signals as
   // well. So for now we only support those libraries that are well-behaved.
   if (str_out) {
     str_str_fn sfn = (str_str_fn) fn;
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 734f6f9e38..c1804067e9 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -290,7 +290,7 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
         }
 
 #if defined(UNIX)
-        // Verify that we have found the end of a UNIX ${VAR} style variable
+        // Verify that we have found the end of a Unix ${VAR} style variable
         if (src[1] == '{' && *tail != '}') {
           var = NULL;
         } else {
diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c
index ba1dcf631a..188f0802c9 100644
--- a/src/nvim/os/time.c
+++ b/src/nvim/os/time.c
@@ -93,7 +93,7 @@ struct tm *os_localtime_r(const time_t *restrict clock,
 #endif
 }
 
-/// Obtains the current UNIX timestamp and adjusts it to local time
+/// Obtains the current Unix timestamp and adjusts it to local time.
 ///
 /// @param result Pointer to a 'struct tm' where the result should be placed
 /// @return A pointer to a 'struct tm' in the current time zone (the 'result'
@@ -104,7 +104,7 @@ struct tm *os_get_localtime(struct tm *result) FUNC_ATTR_NONNULL_ALL
   return os_localtime_r(&rawtime, result);
 }
 
-/// Obtains the current UNIX timestamp
+/// Obtains the current Unix timestamp.
 ///
 /// @return Seconds since epoch.
 Timestamp os_time(void)
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 23b22b67f1..5ac3d07f67 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -196,7 +196,7 @@ char_u *get_past_head(char_u *path)
 int vim_ispathsep(int c)
 {
 #ifdef UNIX
-  return c == '/';          /* UNIX has ':' inside file names */
+  return c == '/';          // Unix has ':' inside file names
 #else
 # ifdef BACKSLASH_IN_FILENAME
   return c == ':' || c == '/' || c == '\\';
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index e0e12a24f2..9e00a3e8f8 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -148,8 +148,8 @@ describe('env function', function()
       local name = 'NEOVIM_UNIT_TEST_EXPAND_ENV_ESCN'
       local value = 'NEOVIM_UNIT_TEST_EXPAND_ENV_ESCV'
       os_setenv(name, value, 1)
-      -- TODO(bobtwinkles) This only tests UNIX expansions. There should be a
-      -- test for windows as well
+      -- TODO(bobtwinkles) This only tests Unix expansions. There should be a
+      -- test for Windows as well
       local input1 = to_cstr('$NEOVIM_UNIT_TEST_EXPAND_ENV_ESCN/test')
       local input2 = to_cstr('${NEOVIM_UNIT_TEST_EXPAND_ENV_ESCN}/test')
       local output_buff1 = cstr(255, '')
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index de421365c4..d7bb620236 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 
 # Cross compiling: use these for dependencies built for the
 # HOST system, when not crosscompiling these should be the
-# same as DEPS_*. Except when targeting UNIX in which case
+# same as DEPS_*. Except when targeting Unix in which case
 # want all the dependencies to use the same compiler.
 if(CMAKE_CROSSCOMPILING AND NOT UNIX)
   set(HOSTDEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/host")
diff --git a/third-party/cmake/BuildMsgpack.cmake b/third-party/cmake/BuildMsgpack.cmake
index f0d5fab676..4b6b361e85 100644
--- a/third-party/cmake/BuildMsgpack.cmake
+++ b/third-party/cmake/BuildMsgpack.cmake
@@ -53,7 +53,7 @@ if(MINGW AND CMAKE_CROSSCOMPILING)
     # Hack to avoid -rdynamic in Mingw
     -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="")
 elseif(MSVC)
-  # Same as UNIX without fPIC
+  # Same as Unix without fPIC
   set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
     -DMSGPACK_ENABLE_CXX=OFF
     -DMSGPACK_BUILD_TESTS=OFF