Space trimmage mega-diff.

50 files changed, 181 insertions, 181 deletions

diff --git a/CHANGES b/CHANGES
index 67387c37..01f1cd3b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -286,7 +286,7 @@
 18 January 2009
 
 * Unbreak UTF-8.
-* -a flag to next-window and previous-window to select the next or previous 
+* -a flag to next-window and previous-window to select the next or previous
   window with activity or bell. Bound to M-n and M-p.
 * find-window command to search window names, titles and visible content (but
   not history) for a string. If only one is found, the window is selected
@@ -371,7 +371,7 @@
 
 * Vertical window splitting. Currently can only split a window into two panes.
   New split-window command splits (bound to ") and switch-pane command (bound to
-  o) switches between panes. 
+  o) switches between panes.
 
   close-pane, swap-pane commands are to follow. Also to come are pane resizing,
   >2 panes, the ability to break a pane out to a full window and vice versa and
@@ -390,7 +390,7 @@
 
 * New option, lock-after-time. If there is no activity in the period specified
   by this option (in seconds), tmux will lock the server. Default is 1800 (30
-  minutes), set to 0 to disable. 
+  minutes), set to 0 to disable.
 * Server locking. Two new commands: set-password to set a password (a
   preencrypted password may be specified with -c); and lock-server to lock the
   server until the password is entered. Also an additional command line flag,
@@ -1243,7 +1243,7 @@
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
 
-$Id: CHANGES,v 1.283 2009-05-04 13:20:01 nicm Exp $
+$Id: CHANGES,v 1.284 2009-05-04 17:58:25 nicm Exp $
 
  LocalWords:  showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
  LocalWords:  rivo nurges lscm Erdely eol smysession mysession ek dstname RB ms
diff --git a/Makefile b/Makefile
index c4e71042..c7a025bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.129 2009-04-30 21:17:06 nicm Exp $
+# $Id: Makefile,v 1.130 2009-05-04 17:58:25 nicm Exp $
 
 .SUFFIXES: .c .o .y .h
 .PHONY: clean update-index.html upload-index.html
@@ -104,7 +104,7 @@ DISTFILES= *.[chyl] Makefile GNUmakefile *.[1-9] NOTES TODO CHANGES FAQ \
 
 CLEANFILES= ${PROG} *.o .depend *~ ${PROG}.core *.log compat/*.o index.html
 
-CPPFLAGS:= ${INCDIRS} ${CPPFLAGS} 
+CPPFLAGS:= ${INCDIRS} ${CPPFLAGS}
 
 .c.o:
 		${CC} ${CPPFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
diff --git a/TODO b/TODO
index 13aa2743..231f7c48 100644
--- a/TODO
+++ b/TODO
@@ -55,7 +55,7 @@
   window-more. what for? isnt this the same as doing it w/ splitw/neww now?
 - would be nice if tmux could be the shell (tmux attach, but hard link to tmux
   binary as "tmuxsh" or wrapper script?) -- problems with tty dev permissions
-- support other mouse modes (highlight etc) and use it in copy mode 
+- support other mouse modes (highlight etc) and use it in copy mode
 - set-remain-on-exit is a bit of a hack, some way to do it generically?
 - set-option should be set-session-option and should be overall global options
   for stuff like mode keys?
diff --git a/client.c b/client.c
index 15c29349..681dfee8 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.46 2009-03-31 22:20:42 nicm Exp $ */
+/* $Id: client.c,v 1.47 2009-05-04 17:58:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -150,7 +150,7 @@ client_main(struct client_ctx *cctx)
 			client_handle_winch(cctx);
 		if (sigcont) {
 			siginit();
-			client_write_server(cctx, MSG_WAKEUP, NULL, 0);	
+			client_write_server(cctx, MSG_WAKEUP, NULL, 0);
 			sigcont = 0;
 		}
 
diff --git a/clock.c b/clock.c
index 9f7d1c0e..bdd89c3b 100644
--- a/clock.c
+++ b/clock.c
@@ -1,4 +1,4 @@
-/* $Id: clock.c,v 1.3 2009-03-27 16:59:57 nicm Exp $ */
+/* $Id: clock.c,v 1.4 2009-05-04 17:58:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -125,7 +125,7 @@ clock_draw(struct screen_write_ctx *ctx, u_int colour, int style)
 			screen_write_puts(ctx, &gc, "%s", tim);
 		}
 		return;
-	}		
+	}
 
 	x = (screen_size_x(s) / 2) - 3 * strlen(tim);
 	y = (screen_size_y(s) / 2) - 3;
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index ad9ed857..d2c2b988 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-attach-session.c,v 1.24 2009-01-23 16:59:14 nicm Exp $ */
+/* $Id: cmd-attach-session.c,v 1.25 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -45,7 +45,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct cmd_target_data	*data = self->data;
 	struct session		*s;
 	char			*cause;
-	
+
 	if (ctx->curclient != NULL)
 		return (0);
 
diff --git a/cmd-bind-key.c b/cmd-bind-key.c
index 1991bae9..33a04164 100644
--- a/cmd-bind-key.c
+++ b/cmd-bind-key.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-bind-key.c,v 1.20 2009-03-28 14:08:09 nicm Exp $ */
+/* $Id: cmd-bind-key.c,v 1.21 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -65,7 +65,7 @@ cmd_bind_key_parse(struct cmd *self, int argc, char **argv, char **cause)
 		case 'r':
 			data->can_repeat = 1;
 			break;
-		default:			
+		default:
 			goto usage;
 		}
 	}
diff --git a/cmd-break-pane.c b/cmd-break-pane.c
index 95a0171f..e8e3f945 100644
--- a/cmd-break-pane.c
+++ b/cmd-break-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-break-pane.c,v 1.1 2009-03-07 09:29:54 nicm Exp $ */
+/* $Id: cmd-break-pane.c,v 1.2 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -50,7 +50,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct window_pane	*wp;
 	struct window		*w;
 	char			*cause;
-	
+
 	if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
 		return (-1);
 	if (data->pane == -1)
diff --git a/cmd-choose-session.c b/cmd-choose-session.c
index dd637a55..84569a68 100644
--- a/cmd-choose-session.c
+++ b/cmd-choose-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-session.c,v 1.6 2009-01-19 18:23:40 nicm Exp $ */
+/* $Id: cmd-choose-session.c,v 1.7 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -61,7 +61,7 @@ cmd_choose_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
-		
+
 	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
 		return (0);
 
diff --git a/cmd-choose-window.c b/cmd-choose-window.c
index 9963fb5c..ede89516 100644
--- a/cmd-choose-window.c
+++ b/cmd-choose-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-choose-window.c,v 1.8 2009-04-30 16:27:29 nicm Exp $ */
+/* $Id: cmd-choose-window.c,v 1.9 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -63,7 +63,7 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
-		
+
 	if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0)
 		return (0);
 
diff --git a/cmd-delete-buffer.c b/cmd-delete-buffer.c
index 377ff622..f94e4c13 100644
--- a/cmd-delete-buffer.c
+++ b/cmd-delete-buffer.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-delete-buffer.c,v 1.4 2009-01-19 18:23:40 nicm Exp $ */
+/* $Id: cmd-delete-buffer.c,v 1.5 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -56,6 +56,6 @@ cmd_delete_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
 		ctx->error(ctx, "no buffer %d", data->buffer);
 		return (-1);
 	}
-	
+
 	return (0);
 }
diff --git a/cmd-find-window.c b/cmd-find-window.c
index a597582a..a3a4a51b 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-find-window.c,v 1.6 2009-03-29 11:18:28 nicm Exp $ */
+/* $Id: cmd-find-window.c,v 1.7 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -70,7 +70,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
-	
+
 	ARRAY_INIT(&list_idx);
 	ARRAY_INIT(&list_ctx);
 
@@ -86,7 +86,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 				if (sres == NULL &&
 				    strstr(wp->base.title, data->arg) == NULL)
 					continue;
-				
+
 				if (sres == NULL) {
 					xasprintf(&sctx,
 					    "pane %u title: \"%s\"", i - 1,
@@ -96,9 +96,9 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 					xfree(sres);
 				}
 			}
-				
+
 			ARRAY_ADD(&list_idx, wm->idx);
-			ARRAY_ADD(&list_ctx, sctx);			
+			ARRAY_ADD(&list_ctx, sctx);
 		}
 	}
 
@@ -123,7 +123,7 @@ cmd_find_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		wm = winlink_find_by_index(
 		    &s->windows, ARRAY_ITEM(&list_idx, i));
 		w = wm->window;
-		
+
 		sctx = ARRAY_ITEM(&list_ctx, i);
 		window_choose_add(wl->window->active,
 		    wm->idx, "%3d: %s [%ux%u] (%u panes) %s", wm->idx, w->name,
@@ -170,7 +170,7 @@ cmd_find_window_search(struct window_pane *wp, const char *searchstr)
 	u_int	 		 i, j, k;
 
 	buf = xmalloc(1);
-				
+
 	for (j = 0; j < screen_size_y(&wp->base); j++) {
 		off = 0;
 		for (i = 0; i < screen_size_x(&wp->base); i++) {
@@ -191,7 +191,7 @@ cmd_find_window_search(struct window_pane *wp, const char *searchstr)
 		while (off > 0 && buf[off - 1] == ' ')
 			off--;
 		buf[off] = '\0';
-		
+
 		if ((s = strstr(buf, searchstr)) != NULL) {
 			s = section_string(buf, off, s - buf, 40);
 			xfree(buf);
diff --git a/cmd-generic.c b/cmd-generic.c
index d6a1f8bc..70d3e1cc 100644
--- a/cmd-generic.c
+++ b/cmd-generic.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-generic.c,v 1.25 2009-04-03 17:31:44 nicm Exp $ */
+/* $Id: cmd-generic.c,v 1.26 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -618,7 +618,7 @@ cmd_pane_parse(struct cmd *self, int argc, char **argv, char **cause)
 					goto error;
 				}
 				data->pane = n;
-			}			
+			}
 			break;
 		case 't':
 			if (data->target == NULL)
diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index 202bfd5f..7795d603 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-kill-pane.c,v 1.6 2009-04-01 21:10:08 nicm Exp $ */
+/* $Id: cmd-kill-pane.c,v 1.7 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -47,7 +47,7 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct cmd_pane_data	*data = self->data;
 	struct winlink		*wl;
 	struct window_pane	*wp;
-	
+
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
 	if (data->pane == -1)
diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index a32f6b1a..ce022fbc 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-keys.c,v 1.13 2009-01-19 18:23:40 nicm Exp $ */
+/* $Id: cmd-list-keys.c,v 1.14 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -49,7 +49,7 @@ cmd_list_keys_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	SPLAY_FOREACH(bd, key_bindings, &key_bindings) {
 		if ((key = key_string_lookup_key(bd->key)) == NULL)
 			continue;
-		
+
 		*tmp = '\0';
 		cmd_list_print(bd->cmdlist, tmp, sizeof tmp);
 		ctx->print(ctx, "%11s: %s", key, tmp);
diff --git a/cmd-list-windows.c b/cmd-list-windows.c
index ad19117e..dec5c6f3 100644
--- a/cmd-list-windows.c
+++ b/cmd-list-windows.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list-windows.c,v 1.34 2009-04-30 16:27:29 nicm Exp $ */
+/* $Id: cmd-list-windows.c,v 1.35 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -48,7 +48,7 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct session		*s;
 	struct winlink		*wl;
 	struct window		*w;
-	struct window_pane	*wp;	
+	struct window_pane	*wp;
 	struct grid		*gd;
 	u_int			 i;
 	unsigned long long	 size;
@@ -64,7 +64,7 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 		TAILQ_FOREACH(wp, &w->panes, entry) {
 			gd = wp->base.grid;
-			
+
 			size = 0;
 			for (i = 0; i < gd->hsize; i++) {
 				size += gd->size[i] * sizeof **gd->data;
@@ -76,9 +76,9 @@ cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
 			if (wp->fd != -1)
 				name = ttyname(wp->fd);
 			else
-				name = "unknown";		
-			ctx->print(ctx, 
-			    "     %s [%ux%u %s] [history %u/%u, %llu bytes]", 
+				name = "unknown";
+			ctx->print(ctx,
+			    "     %s [%ux%u %s] [history %u/%u, %llu bytes]",
 			    name, wp->sx, wp->sy, layout_name(w), gd->hsize,
 			    gd->hlimit, size);
 		}
diff --git a/cmd-list.c b/cmd-list.c
index af9e105b..2cee7674 100644
--- a/cmd-list.c
+++ b/cmd-list.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-list.c,v 1.4 2009-04-30 21:53:32 nicm Exp $ */
+/* $Id: cmd-list.c,v 1.5 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -44,18 +44,18 @@ cmd_list_parse(int argc, char **argv, char **cause)
 		if (arglen > 1 && argv[i][arglen - 2] == '\\') {
 			argv[i][arglen - 2] = ';';
 			continue;
-		} 
+		}
 
 		new_argc = i - lastsplit;
 		new_argv = argv + lastsplit;
 		if (arglen != 1)
 			new_argc++;
-		
+
 		cmd = cmd_parse(new_argc, new_argv, cause);
 		if (cmd == NULL)
 			goto bad;
 		TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
-		
+
 		lastsplit = i + 1;
 	}
 
@@ -65,7 +65,7 @@ cmd_list_parse(int argc, char **argv, char **cause)
 			goto bad;
 		TAILQ_INSERT_TAIL(cmdlist, cmd, qentry);
 	}
-       
+
 	return (cmdlist);
 
 bad:
@@ -125,7 +125,7 @@ void
 cmd_list_free(struct cmd_list *cmdlist)
 {
 	struct cmd	*cmd;
-	
+
 	while (!TAILQ_EMPTY(cmdlist)) {
 		cmd = TAILQ_FIRST(cmdlist);
 		TAILQ_REMOVE(cmdlist, cmd, qentry);
diff --git a/cmd-new-session.c b/cmd-new-session.c
index e5756d0d..acb8f3a2 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.40 2009-04-01 18:21:24 nicm Exp $ */
+/* $Id: cmd-new-session.c,v 1.41 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -118,7 +118,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	if (ctx->curclient != NULL)
 		return (0);
-	
+
 	if (!data->flag_detached) {
 		if (c == NULL) {
 			ctx->error(ctx, "no client to attach to");
diff --git a/cmd-rename-window.c b/cmd-rename-window.c
index d19ca68e..36867eee 100644
--- a/cmd-rename-window.c
+++ b/cmd-rename-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-rename-window.c,v 1.26 2009-01-20 19:35:03 nicm Exp $ */
+/* $Id: cmd-rename-window.c,v 1.27 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -53,7 +53,7 @@ cmd_rename_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	xfree(wl->window->name);
 	wl->window->name = xstrdup(data->arg);
-	options_set_number(&wl->window->options, "automatic-rename", 0);	
+	options_set_number(&wl->window->options, "automatic-rename", 0);
 
 	server_status_session(s);
 
diff --git a/cmd-resize-pane.c b/cmd-resize-pane.c
index 70e7b2cd..7a1857af 100644
--- a/cmd-resize-pane.c
+++ b/cmd-resize-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-resize-pane.c,v 1.2 2009-04-30 06:04:26 nicm Exp $ */
+/* $Id: cmd-resize-pane.c,v 1.3 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -69,7 +69,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	const char	       	*errstr;
 	struct window_pane	*wp, *wq;
 	u_int			 adjust;
-	
+
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
 	if (wl->window->layout != 0) {
diff --git a/cmd-server-info.c b/cmd-server-info.c
index 78115d30..df2a2033 100644
--- a/cmd-server-info.c
+++ b/cmd-server-info.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-server-info.c,v 1.16 2009-04-29 22:29:20 nicm Exp $ */
+/* $Id: cmd-server-info.c,v 1.17 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -67,7 +67,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 
 	tim = ctime(&start_time);
 	*strchr(tim, '\n') = '\0';
-	ctx->print(ctx, 
+	ctx->print(ctx,
 	    "tmux " BUILD ", pid %ld, started %s", (long) getpid(), tim);
 	ctx->print(ctx, "socket path %s, debug level %d%s",
 	    socket_path, debug_level, be_quiet ? ", quiet" : "");
@@ -91,8 +91,8 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 			continue;
 
 		ctx->print(ctx, "%2d: %s (%d, %d): %s [%ux%u %s] "
-		    "[flags=0x%x/0x%x]", i, c->tty.path, c->fd, c->tty.fd, 
-		    c->session->name, c->tty.sx, c->tty.sy, c->tty.termname, 
+		    "[flags=0x%x/0x%x]", i, c->tty.path, c->fd, c->tty.fd,
+		    c->session->name, c->tty.sx, c->tty.sy, c->tty.termname,
 		    c->flags, c->tty.flags);
 	}
 	ctx->print(ctx, "");
diff --git a/cmd-split-window.c b/cmd-split-window.c
index 3336fbd7..cbd840ba 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-split-window.c,v 1.12 2009-04-03 17:21:46 nicm Exp $ */
+/* $Id: cmd-split-window.c,v 1.13 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -171,7 +171,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 	}
 	server_redraw_window(w);
-	
+
 	if (!data->flag_detached) {
 		window_set_active_pane(w, wp);
 		session_select(s, wl->idx);
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 54cc2e99..495166c1 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-swap-pane.c,v 1.4 2009-04-03 17:21:46 nicm Exp $ */
+/* $Id: cmd-swap-pane.c,v 1.5 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -111,7 +111,7 @@ cmd_swap_pane_parse(struct cmd *self, int argc, char **argv, char **cause)
 					goto error;
 				}
 				data->src = n;
-			}			
+			}
 			break;
 		case 'q':
 			if (data->dst == -1) {
@@ -124,7 +124,7 @@ cmd_swap_pane_parse(struct cmd *self, int argc, char **argv, char **cause)
 			}
 			data->flag_up = 0;
 			data->flag_down = 0;
-			break; 
+			break;
 		case 'U':
 			data->flag_up = 1;
 			data->flag_down = 0;
@@ -195,7 +195,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	}
 
 	if (src_wp == dst_wp)
-		return (0); 
+		return (0);
 
 	tmp_wp = TAILQ_PREV(dst_wp, window_panes, entry);
 	TAILQ_REMOVE(&w->panes, dst_wp, entry);
diff --git a/cmd.c b/cmd.c
index 789fc396..c9f7035f 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.92 2009-04-30 21:17:06 nicm Exp $ */
+/* $Id: cmd.c,v 1.93 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -67,7 +67,7 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_rename_session_entry,
 	&cmd_rename_window_entry,
 	&cmd_resize_pane_entry,
-	&cmd_respawn_window_entry,	
+	&cmd_respawn_window_entry,
 	&cmd_rotate_window_entry,
 	&cmd_save_buffer_entry,
 	&cmd_scroll_mode_entry,
diff --git a/grid.c b/grid.c
index a115d744..0d8adb8a 100644
--- a/grid.c
+++ b/grid.c
@@ -1,4 +1,4 @@
-/* $Id: grid.c,v 1.15 2009-03-30 19:44:55 nicm Exp $ */
+/* $Id: grid.c,v 1.16 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -375,12 +375,12 @@ grid_clear_lines(struct grid *gd, u_int py, u_int ny)
 	for (yy = py; yy < py + ny; yy++) {
 		if (gd->data[yy] != NULL) {
 			xfree(gd->data[yy]);
-			gd->data[yy] = NULL;	
+			gd->data[yy] = NULL;
 			gd->size[yy] = 0;
 		}
 		if (gd->udata[yy] != NULL) {
 			xfree(gd->udata[yy]);
-			gd->udata[yy] = NULL;	
+			gd->udata[yy] = NULL;
 			gd->usize[yy] = 0;
 		}
 	}
@@ -413,10 +413,10 @@ grid_move_lines(struct grid *gd, u_int dy, u_int py, u_int ny)
 		grid_clear_lines(gd, yy, 1);
 	}
 
-	memmove(&gd->data[dy], &gd->data[py], ny * (sizeof *gd->data));	
+	memmove(&gd->data[dy], &gd->data[py], ny * (sizeof *gd->data));
 	memmove(&gd->size[dy], &gd->size[py], ny * (sizeof *gd->size));
 
-	memmove(&gd->udata[dy], &gd->udata[py], ny * (sizeof *gd->udata));	
+	memmove(&gd->udata[dy], &gd->udata[py], ny * (sizeof *gd->udata));
 	memmove(&gd->usize[dy], &gd->usize[py], ny * (sizeof *gd->usize));
 
 	/* Wipe any lines that have been moved (without freeing them). */
diff --git a/input-keys.c b/input-keys.c
index eca7bcfc..8df8c5c3 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -1,4 +1,4 @@
-/* $Id: input-keys.c,v 1.26 2009-03-02 18:05:40 nicm Exp $ */
+/* $Id: input-keys.c,v 1.27 2009-05-04 17:58:26 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -70,7 +70,7 @@ struct input_key_ent input_keys[] = {
 	{ KEYC_ADDCTL(KEYC_DOWN),  "\033Ob", 0 },
 	{ KEYC_ADDCTL(KEYC_RIGHT), "\033Oc", 0 },
 	{ KEYC_ADDCTL(KEYC_LEFT),  "\033Od", 0 },
-	
+
 	{ KEYC_ADDSFT(KEYC_UP),    "\033[a", 0 },
 	{ KEYC_ADDSFT(KEYC_DOWN),  "\033[b", 0 },
 	{ KEYC_ADDSFT(KEYC_RIGHT), "\033[c", 0 },
@@ -85,7 +85,7 @@ struct input_key_ent input_keys[] = {
 	{ KEYC_DOWN,   "\033[B",   0 },
 	{ KEYC_RIGHT,  "\033[C",   0 },
 	{ KEYC_LEFT,   "\033[D",   0 },
-	    
+
 	/* Keypad keys. Keypad versions must come first. */
 	{ KEYC_KP0_1,  "/", INPUTKEY_KEYPAD },
 	{ KEYC_KP0_2,  "*", INPUTKEY_KEYPAD },
diff --git a/input.c b/input.c
index 087a148d..6e778559 100644
--- a/input.c
+++ b/