A few follow-up conflict resolutions

app.go

@@ -391,7 +391,7 @@ func (a *App) RunAsSubcommand(ctx *Context) (err error) {
 		}
 		_, _ = fmt.Fprintf(a.Writer, "%s %s\n\n", "Incorrect Usage.", err.Error())
 		if a.Suggest {
-			if suggestion, err := a.suggestFlagFromError(err, context.Command.Name); err == nil {
+			if suggestion, err := a.suggestFlagFromError(err, cCtx.Command.Name); err == nil {
 				fmt.Fprintf(a.Writer, suggestion)
 			}
 		}

command.go

@@ -121,7 +121,7 @@ func (c *Command) Run(ctx *Context) (err error) {
 		_, _ = fmt.Fprintln(cCtx.App.Writer)
 		if ctx.App.Suggest {
 			if suggestion, err := ctx.App.suggestFlagFromError(err, c.Name); err == nil {
-				fmt.Fprintf(context.App.Writer, suggestion)
+				fmt.Fprintf(cCtx.App.Writer, suggestion)
 			}
 		}
 		_ = ShowCommandHelp(cCtx, c.Name)

godoc-current.txt

@@ -305,6 +305,8 @@ type App struct {
 	// single-character bool arguments into one
 	// i.e. foobar -o -v -> foobar -ov
 	UseShortOptionHandling bool
+	// Enable suggestions for commands and flags
+	Suggest bool
 
 	// Has unexported fields.
 }

testdata/godoc-v2.x.txt

@@ -305,6 +305,8 @@ type App struct {
 	// single-character bool arguments into one
 	// i.e. foobar -o -v -> foobar -ov
 	UseShortOptionHandling bool
+	// Enable suggestions for commands and flags
+	Suggest bool
 
 	// Has unexported fields.
 }