summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-10-04 08:23:02 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-10-04 08:23:02 +0000
commit91042ebb8530b943fb57329047f6c6ba03901116 (patch)
treec3a80945af7a0111fea1e7630e99d25961aa4816
parent9686f4f230e950c4d893fd3c6fa263dff97f5443 (diff)
Support C-n/C-p with emacs keys in choice mode, also fix a comment.
-rw-r--r--usr.bin/tmux/mode-key.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/tmux/mode-key.c b/usr.bin/tmux/mode-key.c
index 062ca6e5413..afc3b70e1f8 100644
--- a/usr.bin/tmux/mode-key.c
+++ b/usr.bin/tmux/mode-key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mode-key.c,v 1.17 2009/09/02 06:33:20 nicm Exp $ */
+/* $OpenBSD: mode-key.c,v 1.18 2009/10/04 08:23:01 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -191,7 +191,7 @@ struct mode_key_tree mode_key_tree_vi_copy;
/* emacs editing keys. */
const struct mode_key_entry mode_key_emacs_edit[] = {
{ '\001' /* C-a */, 0, MODEKEYEDIT_STARTOFLINE },
- { '\002' /* C-p */, 0, MODEKEYEDIT_CURSORLEFT },
+ { '\002' /* C-b */, 0, MODEKEYEDIT_CURSORLEFT },
{ '\003' /* C-c */, 0, MODEKEYEDIT_CANCEL },
{ '\004' /* C-d */, 0, MODEKEYEDIT_DELETE },
{ '\005' /* C-e */, 0, MODEKEYEDIT_ENDOFLINE },
@@ -221,6 +221,8 @@ struct mode_key_tree mode_key_tree_emacs_edit;
/* emacs choice selection keys. */
const struct mode_key_entry mode_key_emacs_choice[] = {
{ '\003' /* C-c */, 0, MODEKEYCHOICE_CANCEL },
+ { '\016' /* C-n */, 0, MODEKEYCHOICE_DOWN },
+ { '\020' /* C-p */, 0, MODEKEYCHOICE_UP },
{ '\033' /* Escape */, 0, MODEKEYCHOICE_CANCEL },
{ '\r', 0, MODEKEYCHOICE_CHOOSE },
{ 'q', 0, MODEKEYCHOICE_CANCEL },