=== modified file 't/20canon.c' --- t/20canon.c 2011-08-28 16:57:57 +0000 +++ t/20canon.c 2011-08-28 16:50:18 +0000 @@ -9,7 +9,7 @@ #define CLEAR_KEY do { key.type = -1; key.code.codepoint = -1; key.modifiers = -1; key.utf8[0] = 0; } while(0) - plan_tests(26); + plan_tests(18); tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS); @@ -45,22 +45,6 @@ is_int(key.modifiers, 0, "key.modifiers for Space/symbol"); is_str(endp, "", "consumed entire input for Space/symbol"); - CLEAR_KEY; - endp = termkey_strpkey(tk, "DEL", &key, 0); - is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for Del/unconverted"); - is_int(key.code.sym, TERMKEY_SYM_DEL, "key.code.codepoint for Del/unconverted"); - is_int(key.modifiers, 0, "key.modifiers for Del/unconverted"); - is_str(endp, "", "consumed entire input for Del/unconverted"); - - termkey_set_canonflags(tk, termkey_get_canonflags(tk) | TERMKEY_CANON_DELBS); - - CLEAR_KEY; - endp = termkey_strpkey(tk, "DEL", &key, 0); - is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for Del/as-backspace"); - is_int(key.code.sym, TERMKEY_SYM_BACKSPACE, "key.code.codepoint for Del/as-backspace"); - is_int(key.modifiers, 0, "key.modifiers for Del/as-backspace"); - is_str(endp, "", "consumed entire input for Del/as-backspace"); - termkey_destroy(tk); return exit_status(); === modified file 'termkey.c' --- termkey.c 2011-08-28 16:57:57 +0000 +++ termkey.c 2011-08-28 16:50:18 +0000 @@ -610,12 +610,6 @@ fill_utf8(key); } } - - if(flags & TERMKEY_CANON_DELBS) { - if(key->type == TERMKEY_TYPE_KEYSYM && key->code.sym == TERMKEY_SYM_DEL) { - key->code.sym = TERMKEY_SYM_BACKSPACE; - } - } } static TermKeyResult peekkey(TermKey *tk, TermKeyKey *key, int force, size_t *nbytep) === modified file 'termkey.h.in' --- termkey.h.in 2011-08-28 16:57:57 +0000 +++ termkey.h.in 2011-08-28 16:50:18 +0000 @@ -151,7 +151,6 @@ enum { TERMKEY_CANON_SPACESYMBOL = 1 << 0, // Space is symbolic rather than Unicode - TERMKEY_CANON_DELBS = 1 << 1, // Del is converted to Backspace }; void termkey_check_version(int major, int minor); === modified file 'termkey_canonicalise.3' --- termkey_canonicalise.3 2011-08-28 16:57:57 +0000 +++ termkey_canonicalise.3 2011-08-28 16:50:18 +0000 @@ -16,9 +16,6 @@ .TP .B TERMKEY_CANON_SPACESYMBOL If this flag is set then a Unicode space character is represented using the \fBTERMKEY_SYM_SPACE\fP symbol. If this flag is not set, it is represented by the U+0020 Unicode codepoint. -.TP -.B TERMKEY_CANON_DELBS -If this flag is set then an ASCII DEL character is represented by the \fBTERMKEY_SYM_BACKSPACE\fP symbol. If not, it is represented by \fBTERMKEY_SYM_DEL\fP. An ASCII BS character is always represented by \fBTERMKEY_SYM_BACKSPACE\fP, regardless of this flag. .SH "RETURN VALUE" \fBtermkey_canonicalise\fP() returns no value. .SH "SEE ALSO"