diff options
| author | Kjell Wooding <kjell@cvs.openbsd.org> | 2005-11-19 20:14:39 +0000 |
|---|---|---|
| committer | Kjell Wooding <kjell@cvs.openbsd.org> | 2005-11-19 20:14:39 +0000 |
| commit | 4f68b5a18c14f37b9e16bf0227bac7527859a35a (patch) | |
| tree | 5953a9b8059de9c22a28c51ecb17b34fbae89d9a /usr.bin | |
| parent | d85d70b5e7c49f9fb2bc852f1c7e8b573efbb0fc (diff) | |
Goodbye NO_METAKEY
(#ifdef is for emacs developers)
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mg/funmap.c | 4 | ||||
| -rw-r--r-- | usr.bin/mg/kbd.c | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/usr.bin/mg/funmap.c b/usr.bin/mg/funmap.c index 9994783a771..34e473e222e 100644 --- a/usr.bin/mg/funmap.c +++ b/usr.bin/mg/funmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: funmap.c,v 1.17 2005/11/18 20:56:52 deraadt Exp $ */ +/* $OpenBSD: funmap.c,v 1.18 2005/11/19 20:14:38 kjell Exp $ */ /* * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>. All rights reserved. * @@ -140,9 +140,7 @@ static struct funmap functnames[] = { #ifndef NO_BACKUP {makebkfile, "make-backup-files",}, #endif /* !NO_BACKUP */ -#ifdef DO_METAKEY {do_meta, "meta-key-mode",}, /* better name, anyone? */ -#endif /* DO_METAKEY */ {negative_argument, "negative-argument",}, {newline, "newline",}, {indent, "newline-and-indent",}, diff --git a/usr.bin/mg/kbd.c b/usr.bin/mg/kbd.c index 02cd6494ab2..5f2b26968cc 100644 --- a/usr.bin/mg/kbd.c +++ b/usr.bin/mg/kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.c,v 1.18 2005/11/18 20:56:53 deraadt Exp $ */ +/* $OpenBSD: kbd.c,v 1.19 2005/11/19 20:14:38 kjell Exp $ */ /* This file is in the public domain. */ @@ -14,7 +14,6 @@ #include "macro.h" #endif /* !NO_MACRO */ -#ifdef DO_METAKEY #ifndef METABIT #define METABIT 0x80 #endif /* !METABIT */ @@ -45,7 +44,6 @@ do_meta(int f, int n) ewprintf("Meta keys %sabled", use_metakey ? "en" : "dis"); return (TRUE); } -#endif /* DO_METAKEY */ #ifdef BSMAP static int bs_map = BSMAP; @@ -67,11 +65,9 @@ bsmap(int f, int n) void ungetkey(int c) { -#ifdef DO_METAKEY if (use_metakey && pushed && c == CCHR('[')) pushedc |= METABIT; else -#endif /* DO_METAKEY */ pushedc = c; pushed = TRUE; } @@ -106,13 +102,11 @@ getkey(int flag) else if (c == CCHR('?')) c = CCHR('H'); #endif /* BSMAP */ -#ifdef DO_METAKEY if (use_metakey && (c & METABIT)) { pushedc = c & ~METABIT; pushed = TRUE; c = CCHR('['); } -#endif /* DO_METAKEY */ #ifndef NO_DPROMPT if (flag && promptp < &prompt[PROMPTL - 5]) { promptp = keyname(promptp, |