===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-rename-session.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- src/usr.bin/tmux/cmd-rename-session.c	2020/04/13 08:26:27	1.29
+++ src/usr.bin/tmux/cmd-rename-session.c	2020/04/13 10:59:58	1.30
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-rename-session.c,v 1.29 2020/04/13 08:26:27 nicm Exp $ */
+/* $OpenBSD: cmd-rename-session.c,v 1.30 2020/04/13 10:59:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -47,11 +47,12 @@
 cmd_rename_session_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
+	struct cmd_find_state	*target = cmdq_get_target(item);
 	struct client		*c = cmd_find_client(item, NULL, 1);
-	struct session		*s = item->target.s;
+	struct session		*s = target->s;
 	char			*newname;
 
-	newname = format_single(item, args->argv[0], c, s, NULL, NULL);
+	newname = format_single_from_target(item, args->argv[0], c);
 	if (strcmp(newname, s->name) == 0) {
 		free(newname);
 		return (CMD_RETURN_NORMAL);