diff options
| author |   schwarze <schwarze@openbsd.org> | 2016-01-29 19:32:33 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2016-01-29 19:32:33 +0000 |
| commit | 36facb1333aadc7bbe84172389fd409396a9b5a2 (patch) | |
| tree | 8a6914f729e26291f763c955731e06aea1481a76 /lib/libedit/tty.c | |
| parent | Add support for "control/shutdown" power management facility (diff) | |
| download | wireguard-openbsd-36facb1333aadc7bbe84172389fd409396a9b5a2.tar.xz wireguard-openbsd-36facb1333aadc7bbe84172389fd409396a9b5a2.zip | |
Second step in synching with NetBSD:
* Rename some types from *key*_t to *keymacro*_t.
* Rename struct editline member el_key to el_keymacro.
* Rename some functions in keymacro.c from key*() to keymacro*().
This removes the conflict of key_clear(), key_end(), and key_print()
with macros in <term.h>. No functional change.
This makes keymacro.h identical to the NetBSD version.
It reduces the remaining diff from +2640 -1998 to +2446 -1805.
OK czarkoff@
Diffstat (limited to 'lib/libedit/tty.c')
| -rw-r--r-- | lib/libedit/tty.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c index 4873454dcd4..962baaa6829 100644 --- a/lib/libedit/tty.c +++ b/lib/libedit/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.14 2014/05/20 22:28:07 yasuoka Exp $ */ +/* $OpenBSD: tty.c,v 1.15 2016/01/29 19:32:34 schwarze Exp $ */ /* $NetBSD: tty.c,v 1.34 2011/01/27 23:11:40 christos Exp $ */ /*- @@ -899,15 +899,15 @@ tty_bind_char(EditLine *el, int force) if (new[0] == old[0] && !force) continue; /* Put the old default binding back, and set the new binding */ - key_clear(el, map, old); + keymacro_clear(el, map, old); map[UC(old[0])] = dmap[UC(old[0])]; - key_clear(el, map, new); + keymacro_clear(el, map, new); /* MAP_VI == 1, MAP_EMACS == 0... */ map[UC(new[0])] = tp->bind[el->el_map.type]; if (dalt) { - key_clear(el, alt, old); + keymacro_clear(el, alt, old); alt[UC(old[0])] = dalt[UC(old[0])]; - key_clear(el, alt, new); + keymacro_clear(el, alt, new); alt[UC(new[0])] = tp->bind[el->el_map.type + 1]; } } |