aboutsummaryrefslogtreecommitdiff
path: root/cmd-unbind-key.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-10-11 16:52:39 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-10-11 16:52:39 +0100
commit8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1 (patch)
tree3320e1e3b53905d8c50b6067c27b14946271c35b /cmd-unbind-key.c
parente588ddb5d683a9fd5cf595ac5ed2d8ba657a6bcf (diff)
parentd518067be6220757a9101ca27fff14d5f599c410 (diff)
downloadrtmux-8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1.tar.gz
rtmux-8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1.tar.bz2
rtmux-8bcdd8fc21dd97c973c1af7ab9dd9e7acd9650c1.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts: cmd-split-window.c cmd-unbind-key.c format.c osdep-openbsd.c
Diffstat (limited to 'cmd-unbind-key.c')
-rw-r--r--cmd-unbind-key.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/cmd-unbind-key.c b/cmd-unbind-key.c
index 9bd068e1..cf6ad506 100644
--- a/cmd-unbind-key.c
+++ b/cmd-unbind-key.c
@@ -50,7 +50,6 @@ cmd_unbind_key_exec(struct cmd *self, struct cmd_q *cmdq)
cmdq_error(cmdq, "missing key");
return (CMD_RETURN_ERROR);
}
- return (CMD_RETURN_ERROR);
key = key_string_lookup_string(args->argv[0]);
if (key == KEYC_NONE) {
cmdq_error(cmdq, "unknown key: %s", args->argv[0]);