vim-patch:8.1.0989: various small code ugliness

Problem:    Various small code ugliness.
Solution:   Remove pointless NULL checks. Fix function calls. Fix typos.
            (Dominique Pelle, closes vim/vim#4060)
https://github.com/vim/vim/commit/bdace838c67c1bd94e55e34270a8325933891466

1 files changed, 4 insertions, 4 deletions

diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index b5d890bf52..2974245857 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -123,7 +123,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file,
   int shell_style = STYLE_ECHO;
   int check_spaces;
   static bool did_find_nul = false;
-  bool ampersent = false;
+  bool ampersand = false;
   // vimglob() function to define for Posix shell
   static char *sh_vimglob_func =
     "vimglob() { while [ $# -ge 1 ]; do echo \"$1\"; shift; done }; vimglob >";
@@ -245,7 +245,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file,
       p--;
     }
     if (*p == '&') {                            // remove trailing '&'
-      ampersent = true;
+      ampersand = true;
       *p = ' ';
     }
     STRCAT(command, ">");
@@ -309,7 +309,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file,
     shellopts |= kShellOptHideMess;
   }
 
-  if (ampersent) {
+  if (ampersand) {
     STRCAT(command, "&");               // put the '&' after the redirection
   }
 
@@ -331,7 +331,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file,
 
   // When running in the background, give it some time to create the temp
   // file, but don't wait for it to finish.
-  if (ampersent) {
+  if (ampersand) {
     os_delay(10L, true);
   }