From b075ee9dfe9e69fa25555416ba412ed9dd3eb373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Tue, 3 Nov 2015 10:43:29 +0100
Subject: vis: let libtermkey map <DEL> to <Backspace>

---
 config.def.h | 5 -----
 ui-curses.c  | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/config.def.h b/config.def.h
index ef55b32..10c386c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -22,7 +22,6 @@ static KeyBinding basic_movement[] = {
 static KeyBinding vis_movements[] = {
 	{ "h",             ACTION(CURSOR_CHAR_PREV)                },
 	{ "<Backspace>",   ALIAS("h")                              },
-	{ "<DEL>",         ALIAS("<Backspace>")                    },
 	{ "<C-h>",         ALIAS("<Backspace>")                    },
 	{ "l",             ACTION(CURSOR_CHAR_NEXT)                },
 	{ "<Space>",       ALIAS("l")                              },
@@ -181,7 +180,6 @@ static KeyBinding vis_mode_normal[] = {
 	{ "<C-w><C-h>",       ALIAS("<C-w>k")                               },
 	{ "<C-w><C-k>",       ALIAS("<C-w>k")                               },
 	{ "<C-w><Backspace>", ALIAS("<C-w>k")                               },
-	{ "<C-w><DEL>",       ALIAS("<C-w><Backspace>")                     },
 	{ "<C-b>",            ALIAS("<PageUp>")                             },
 	{ "<C-f>",            ALIAS("<PageDown>")                           },
 	{ "<C-u>",            ALIAS("<S-PageUp>")                           },
@@ -237,7 +235,6 @@ static KeyBinding vis_mode_visual[] = {
 	{ "A",                  ACTION(CURSORS_NEW_LINES_END)                 },
 	{ "<Backspace>",        ALIAS("d")                                    },
 	{ "<C-h>",              ALIAS("<Backspace>")                          },
-	{ "<DEL>",              ALIAS("<Backspace>")                          },
 	{ "<Escape>",           ACTION(MODE_NORMAL)                           },
 	{ "<C-c>",              ALIAS("<Escape>")                             },
 	{ "v",                  ALIAS("<Escape>")                             },
@@ -259,7 +256,6 @@ static KeyBinding vis_mode_visual_line[] = {
 
 static KeyBinding vis_mode_readline[] = {
 	{ "<Backspace>",    ACTION(DELETE_CHAR_PREV)                    },
-	{ "<DEL>",          ALIAS("<Backspace>")                        },
 	{ "<C-h>",          ALIAS("<Backspace>")                        },
 	{ "<Escape>",       ACTION(MODE_NORMAL)                         },
 	{ "<C-c>",          ALIAS("<Enter>")                            },
@@ -271,7 +267,6 @@ static KeyBinding vis_mode_readline[] = {
 
 static KeyBinding vis_mode_prompt[] = {
 	{ "<Backspace>",    ACTION(PROMPT_BACKSPACE)                    },
-	{ "<DEL>",          ALIAS("<Backspace>")                        },
 	{ "<C-h>",          ALIAS("<Backspace>")                        },
 	{ "<Enter>",        ACTION(PROMPT_ENTER)                        },
 	{ "<C-j>",          ALIAS("<Enter>")                            },
diff --git a/ui-curses.c b/ui-curses.c
index 66f7828..ea4aac7 100644
--- a/ui-curses.c
+++ b/ui-curses.c
@@ -998,7 +998,7 @@ Ui *ui_curses_new(void) {
 		return NULL;
 	if (!(uic->termkey = termkey_new(STDIN_FILENO, TERMKEY_FLAG_UTF8)))
 		goto err;
-		
+	termkey_set_canonflags(uic->termkey, TERMKEY_CANON_DELBS);
 	setlocale(LC_CTYPE, "");
 	if (!getenv("ESCDELAY"))
 		set_escdelay(50);
-- 
cgit v1.2.3