===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-panes.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- src/usr.bin/tmux/cmd-display-panes.c	2019/05/08 18:07:12	1.25
+++ src/usr.bin/tmux/cmd-display-panes.c	2019/05/20 11:46:06	1.26
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-panes.c,v 1.25 2019/05/08 18:07:12 nicm Exp $ */
+/* $OpenBSD: cmd-display-panes.c,v 1.26 2019/05/20 11:46:06 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -182,17 +182,6 @@
 	}
 }
 
-static enum cmd_retval
-cmd_display_panes_error(struct cmdq_item *item, void *data)
-{
-	char	*error = data;
-
-	cmdq_error(item, "%s", error);
-	free(error);
-
-	return (CMD_RETURN_NORMAL);
-}
-
 static void
 cmd_display_panes_free(struct client *c)
 {
@@ -226,11 +215,13 @@
 	cmd = cmd_template_replace(cdata->command, expanded, 1);
 
 	cmdlist = cmd_string_parse(cmd, NULL, 0, &cause);
-	if (cmdlist == NULL && cause != NULL)
-		new_item = cmdq_get_callback(cmd_display_panes_error, cause);
-	else if (cmdlist == NULL)
-		new_item = NULL;
-	else {
+	if (cmdlist == NULL) {
+		if (cause != NULL)
+			new_item = cmdq_get_error(cause);
+		else
+			new_item = NULL;
+		free(cause);
+	} else {
 		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
 		cmd_list_free(cmdlist);
 	}