From 19e502c64e2c5d30df20f26e53370d19c446c241 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Mon, 5 Oct 2009 18:18:50 +0000 Subject: [PATCH] Sync OpenBSD patchset 354: Support C-n/C-p with emacs keys in choice mode, also fix a comment. --- mode-key.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mode-key.c b/mode-key.c index 5438d0e6..c8b5f1a3 100644 --- a/mode-key.c +++ b/mode-key.c @@ -1,4 +1,4 @@ -/* $Id: mode-key.c,v 1.28 2009-09-02 22:45:17 tcunha Exp $ */ +/* $Id: mode-key.c,v 1.29 2009-10-05 18:18:50 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -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 },