summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJeremie Courreges-Anglas <jca@cvs.openbsd.org>2017-08-30 17:15:37 +0000
committerJeremie Courreges-Anglas <jca@cvs.openbsd.org>2017-08-30 17:15:37 +0000
commit446b827d0ab4bd81bcfc1d284afe138a6c00a628 (patch)
treef0898d762b063582198f4fe78024e1362bb15864 /bin
parent39bd4e025511a2a25ff65123b281262d6ae60bdc (diff)
Guard FEMACSUSEMETA uses behind #ifdef EMACS
Diffstat (limited to 'bin')
-rw-r--r--bin/ksh/misc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index 29f2bd1e10d..b4d57cc31fd 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.58 2017/08/30 17:02:53 jca Exp $ */
+/* $OpenBSD: misc.c,v 1.59 2017/08/30 17:15:36 jca Exp $ */
/*
* Miscellaneous functions
@@ -186,8 +186,10 @@ option(const char *n)
for (i = 0; i < NELEM(options); i++)
if (options[i].name && strcmp(options[i].name, n) == 0) {
+#ifdef EMACS
if (i == FEMACSUSEMETA)
warningf(true, "%s: deprecated option", n);
+#endif
return i;
}
@@ -230,8 +232,10 @@ printoptions(int verbose)
shprintf("Current option settings\n");
for (i = n = oi.opt_width = 0; i < NELEM(options); i++) {
+#ifdef EMACS
if (i == FEMACSUSEMETA)
continue;
+#endif
if (options[i].name) {
len = strlen(options[i].name);
oi.opts[n].name = options[i].name;
@@ -246,8 +250,10 @@ printoptions(int verbose)
/* short version ala ksh93 */
shprintf("set");
for (i = 0; i < NELEM(options); i++) {
+#ifdef EMACS
if (i == FEMACSUSEMETA)
continue;
+#endif
if (options[i].name)
shprintf(" %co %s",
Flag(i) ? '-' : '+',