patch 9.0.0876: code is indented more than needed

Problem:    Code is indented more than needed.
Solution:   Split ExpandEscape() in two. (Yegappan Lakshmanan, closes #11539)

src/cmdexpand.c

@@ -92,24 +92,16 @@ sort_func_compare(const void *s1, const void *s2)
  * Escape special characters in the cmdline completion matches.
  */
     static void
-ExpandEscape(
+wildescape(
     expand_T	*xp,
     char_u	*str,
     int		numfiles,
-    char_u	**files,
+    char_u	**files)
-    int		options)
 {
-    int		i;
     char_u	*p;
     int		vse_what = xp->xp_context == EXPAND_BUFFERS
 						       ? VSE_BUFFER : VSE_NONE;
 
-    // May change home directory back to "~"
-    if (options & WILD_HOME_REPLACE)
-	tilde_replace(str, numfiles, files);
-
-    if (options & WILD_ESCAPE)
-    {
     if (xp->xp_context == EXPAND_FILES
 	    || xp->xp_context == EXPAND_FILES_IN_PATH
 	    || xp->xp_context == EXPAND_SHELLCMD
@@ -118,7 +110,7 @@ ExpandEscape(
     {
 	// Insert a backslash into a file name before a space, \, %, #
 	// and wildmatch characters, except '~'.
-	    for (i = 0; i < numfiles; ++i)
+	for (int i = 0; i < numfiles; ++i)
 	{
 	    // for ":set path=" we need to escape spaces twice
 	    if (xp->xp_backslash == XP_BS_THREE)
@@ -166,7 +158,7 @@ ExpandEscape(
     {
 	// Insert a backslash before characters in a tag name that
 	// would terminate the ":tag" command.
-	    for (i = 0; i < numfiles; ++i)
+	for (int i = 0; i < numfiles; ++i)
 	{
 	    p = vim_strsave_escaped(files[i], (char_u *)"\\|\"");
 	    if (p != NULL)
@@ -176,7 +168,25 @@ ExpandEscape(
 	    }
 	}
     }
-    }
+}
+
+/*
+ * Escape special characters in the cmdline completion matches.
+ */
+    static void
+ExpandEscape(
+    expand_T	*xp,
+    char_u	*str,
+    int		numfiles,
+    char_u	**files,
+    int		options)
+{
+    // May change home directory back to "~"
+    if (options & WILD_HOME_REPLACE)
+	tilde_replace(str, numfiles, files);
+
+    if (options & WILD_ESCAPE)
+	wildescape(xp, str, numfiles, files);
 }
 
 /*
@@ -3238,7 +3248,6 @@ expand_shellcmd_onedir(
 	garray_T	*gap)
 {
     int		ret;
-    int		i;
     hash_T	hash;
     hashitem_T	*hi;
 
@@ -3249,13 +3258,16 @@ expand_shellcmd_onedir(
 
     // Expand matches in one directory of $PATH.
     ret = expand_wildcards(1, &buf, numMatches, matches, flags);
-    if (ret == OK)
+    if (ret != OK)
-    {
+	return;
+
     if (ga_grow(gap, *numMatches) == FAIL)
-	    FreeWild(*numMatches, *matches);
-	else
     {
-	    for (i = 0; i < *numMatches; ++i)
+	FreeWild(*numMatches, *matches);
+	return;
+    }
+
+    for (int i = 0; i < *numMatches; ++i)
     {
 	char_u *name = (*matches)[i];
 
@@ -3276,8 +3288,6 @@ expand_shellcmd_onedir(
 	vim_free(name);
     }
     vim_free(*matches);
-	}
-    }
 }
 
 /*

src/version.c

@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    876,
 /**/
     875,
 /**/