diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-06-05 23:17:03 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-06-05 23:17:03 +0000 |
commit | 15514592f9e479e9e222a3aa0e7e123b98121033 (patch) | |
tree | fd46466cc15cd384bf29bbacb4d5a35edd3a83da | |
parent | 197347b61f4f6cfdf0da94aa3d6205e692e5954e (diff) | |
download | rtmux-15514592f9e479e9e222a3aa0e7e123b98121033.tar.gz rtmux-15514592f9e479e9e222a3aa0e7e123b98121033.tar.bz2 rtmux-15514592f9e479e9e222a3aa0e7e123b98121033.zip |
Don't use entry init since it may be dependent on key.
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | cmd-generic.c | 7 |
2 files changed, 6 insertions, 5 deletions
@@ -13,7 +13,7 @@ tmux renamew -t:0 newname (current session, window 0) tmux renamew -t0 newname (current session, window 0) tmux renamew -t1:0 newname (session 1, window 0) - tmux renamew -t1: newname (session 1, current window) + tmux renamew -t1: newname (session 1's current window) tmux renamew -t/dev/ttypi newname (client /dev/ttypi's current session and window) tmux renamew -t/dev/ttypi: newname (client /dev/ttypi's current @@ -440,4 +440,4 @@ (including mutt, emacs). No status bar yet and no key remapping or other customisation. -$Id: CHANGES,v 1.112 2008-06-05 22:59:38 nicm Exp $ +$Id: CHANGES,v 1.113 2008-06-05 23:17:03 nicm Exp $ diff --git a/cmd-generic.c b/cmd-generic.c index debc051a..c5494657 100644 --- a/cmd-generic.c +++ b/cmd-generic.c @@ -1,4 +1,4 @@ -/* $Id: cmd-generic.c,v 1.8 2008-06-05 21:25:00 nicm Exp $ */ +/* $Id: cmd-generic.c,v 1.9 2008-06-05 23:17:03 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -40,7 +40,8 @@ cmd_target_parse(struct cmd *self, int argc, char **argv, char **cause) struct cmd_target_data *data; int opt; - self->entry->init(self, 0); + /* Don't use the entry version since it may be dependent on key. */ + cmd_target_init(self, 0); data = self->data; while ((opt = getopt(argc, argv, "dkt:")) != EOF) { @@ -155,7 +156,7 @@ cmd_srcdst_parse(struct cmd *self, int argc, char **argv, char **cause) struct cmd_srcdst_data *data; int opt; - self->entry->init(self, 0); + cmd_srcdst_init(self, 0); data = self->data; while ((opt = getopt(argc, argv, "dks:t:")) != EOF) { |