From 95b14341dd119f8d97d31f3415890656c7644fa9 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sun, 18 Jan 2009 19:10:08 +0000
Subject: [PATCH] Don't die when run non-interactively. DOH.

---
 cmd-choose-session.c |  6 ++++--
 cmd-choose-window.c  |  9 ++++++---
 cmd-find-window.c    | 13 ++++++++-----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/cmd-choose-session.c b/cmd-choose-session.c
index 9763918a..151a8e64 100644
--- a/cmd-choose-session.c
+++ b/cmd-choose-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-session.c,v 1.4 2009-01-18 17:20:52 nicm Exp $ */
+/* $Id: cmd-choose-session.c,v 1.5 2009-01-18 19:10:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -54,8 +54,10 @@ cmd_choose_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session			*s;
 	u_int			 	 i, idx, cur;
 
-	if (ctx->curclient == NULL)
+	if (ctx->curclient == NULL) {
+		ctx->error(ctx, "must be run interactively");
 		return;
+	}
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return;
diff --git a/cmd-choose-window.c b/cmd-choose-window.c
index b071770d..b7f90dc6 100644
--- a/cmd-choose-window.c
+++ b/cmd-choose-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-window.c,v 1.5 2009-01-18 17:20:52 nicm Exp $ */
+/* $Id: cmd-choose-window.c,v 1.6 2009-01-18 19:10:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -50,13 +50,16 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data		*data = self->data;
 	struct cmd_choose_window_data	*cdata;
-	struct session			*s = ctx->curclient->session;
+	struct session			*s;
 	struct winlink			*wl, *wm;
 	struct window			*w;
 	u_int			 	 idx, cur;
 
-	if (ctx->curclient == NULL)
+	if (ctx->curclient == NULL) {
+		ctx->error(ctx, "must be run interactively");
 		return;
+	}
+	s = ctx->curclient->session;
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return;
diff --git a/cmd-find-window.c b/cmd-find-window.c
index a9c497da..b46884e0 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-find-window.c,v 1.1 2009-01-18 17:20:52 nicm Exp $ */
+/* $Id: cmd-find-window.c,v 1.2 2009-01-18 19:10:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,8 +32,8 @@ void	cmd_find_window_callback(void *, int);
 char   *cmd_find_window_search(struct window_pane *, const char *);
 
 const struct cmd_entry cmd_find_window_entry = {
-	"find-window", NULL,
-	CMD_TARGET_WINDOW_USAGE,
+	"find-window", "findw",
+	CMD_TARGET_WINDOW_USAGE " match-string",
 	CMD_ARG1,
 	cmd_target_init,
 	cmd_target_parse,
@@ -53,7 +53,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data		*data = self->data;
 	struct cmd_find_window_data	*cdata;
-	struct session			*s = ctx->curclient->session;
+	struct session			*s;
 	struct winlink			*wl, *wm;
 	struct window			*w;
 	struct window_pane		*wp;
@@ -62,8 +62,11 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	char				*sres, *sctx;
 	u_int				 i;
 
-	if (ctx->curclient == NULL)
+	if (ctx->curclient == NULL) {
+		ctx->error(ctx, "must be run interactively");
 		return;
+	}
+	s = ctx->curclient->session;
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return;