diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2018-01-15 14:58:06 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2018-01-15 14:58:06 +0000 |
| commit | 1e1db38a33ecba9e2ad3c9f7308345525c08ebac (patch) | |
| tree | 68b8e165d5cdb25668298063e037d6d8c8c3b309 /bin/ksh/misc.c | |
| parent | ebf81fbfc88061d716d7d3e6c5f53fc9c8180918 (diff) | |
Stop pretending we support building ksh without EDIT/HISTORY support
ok anton@
Diffstat (limited to 'bin/ksh/misc.c')
| -rw-r--r-- | bin/ksh/misc.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c index 37124c3f022..4d2bb22499c 100644 --- a/bin/ksh/misc.c +++ b/bin/ksh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.66 2018/01/14 16:04:21 anton Exp $ */ +/* $OpenBSD: misc.c,v 1.67 2018/01/15 14:58:05 jca Exp $ */ /* * Miscellaneous functions @@ -270,27 +270,25 @@ change_flag(enum sh_flag f, if (what != OF_CMDLINE && newval != oldval) j_change(); } else -#ifdef EDIT if (0 -# ifdef VI +#ifdef VI || f == FVI -# endif /* VI */ -# ifdef EMACS +#endif /* VI */ +#ifdef EMACS || f == FEMACS || f == FGMACS -# endif /* EMACS */ +#endif /* EMACS */ ) { if (newval) { -# ifdef VI +#ifdef VI Flag(FVI) = 0; -# endif /* VI */ -# ifdef EMACS +#endif /* VI */ +#ifdef EMACS Flag(FEMACS) = Flag(FGMACS) = 0; -# endif /* EMACS */ +#endif /* EMACS */ Flag(f) = newval; } } else -#endif /* EDIT */ /* Turning off -p? */ if (f == FPRIVILEGED && oldval && !newval) { gid_t gid = getgid(); |