Remove the conditional directives NO_MACRO and NO_STARTUP.

They have not compiled for numerous years.
ok kjell@ millert@

12 files changed, 22 insertions, 119 deletions

diff --git a/usr.bin/mg/def.h b/usr.bin/mg/def.h
index 867f3b127ca..9bd52408d29 100644
--- a/usr.bin/mg/def.h
+++ b/usr.bin/mg/def.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: def.h,v 1.119 2012/04/11 17:51:10 lum Exp $	*/
+/*	$OpenBSD: def.h,v 1.120 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -14,12 +14,6 @@
 #include	"ttydef.h"
 #include	"chrdef.h"
 
-#ifdef	NO_MACRO
-#ifndef NO_STARTUP
-#define NO_STARTUP		/* NO_MACRO implies NO_STARTUP */
-#endif
-#endif
-
 typedef int	(*PF)(int, int);	/* generally useful type */
 
 /*
@@ -594,12 +588,10 @@ int		 showmatch(int, int);
 /* version.c X */
 int		 showversion(int, int);
 
-#ifndef NO_MACRO
 /* macro.c X */
 int		 definemacro(int, int);
 int		 finishmacro(int, int);
 int		 executemacro(int, int);
-#endif	/* !NO_MACRO */
 
 /* modes.c X */
 int		 indentmode(int, int);
diff --git a/usr.bin/mg/echo.c b/usr.bin/mg/echo.c
index deba7a576df..ce173f63128 100644
--- a/usr.bin/mg/echo.c
+++ b/usr.bin/mg/echo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: echo.c,v 1.49 2009/06/04 23:39:37 kjell Exp $	*/
+/*	$OpenBSD: echo.c,v 1.50 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -11,9 +11,7 @@
 
 #include "def.h"
 #include "key.h"
-#ifndef NO_MACRO
 #include "macro.h"
-#endif /* !NO_MACRO */
 
 #include "funmap.h"
 
@@ -56,10 +54,9 @@ eyorn(const char *sp)
 {
 	int	 s;
 
-#ifndef NO_MACRO
 	if (inmacro)
 		return (TRUE);
-#endif /* !NO_MACRO */
+
 	ewprintf("%s? (y or n) ", sp);
 	for (;;) {
 		s = getkey(FALSE);
@@ -83,17 +80,15 @@ eyesno(const char *sp)
 {
 	char	 buf[64], *rep;
 
-#ifndef NO_MACRO
 	if (inmacro)
 		return (TRUE);
-#endif /* !NO_MACRO */
+
 	rep = eread("%s? (yes or no) ", buf, sizeof(buf),
 	    EFNUL | EFNEW | EFCR, sp);
 	for (;;) {
 		if (rep == NULL)
 			return (ABORT);
 		if (rep[0] != '\0') {
-#ifndef NO_MACRO
 			if (macrodef) {
 				struct line	*lp = maclcur;
 
@@ -101,7 +96,6 @@ eyesno(const char *sp)
 				maclcur->l_fp = lp->l_fp;
 				free(lp);
 			}
-#endif /* !NO_MACRO */
 			if ((rep[0] == 'y' || rep[0] == 'Y') &&
 			    (rep[1] == 'e' || rep[1] == 'E') &&
 			    (rep[2] == 's' || rep[2] == 'S') &&
@@ -158,7 +152,6 @@ veread(const char *fp, char *buf, size_t nbuf, int flag, va_list ap)
 
 	static char emptyval[] = "";	/* XXX hackish way to return err msg*/
 
-#ifndef NO_MACRO
 	if (inmacro) {
 		if (dynbuf) {
 			if ((buf = malloc(maclcur->l_used + 1)) == NULL)
@@ -170,7 +163,6 @@ veread(const char *fp, char *buf, size_t nbuf, int flag, va_list ap)
 		maclcur = maclcur->l_fp;
 		return (buf);
 	}
-#endif /* !NO_MACRO */
 	epos = cpos = 0;
 	ml = mr = esc = 0;
 	cplflag = FALSE;
@@ -344,7 +336,6 @@ veread(const char *fp, char *buf, size_t nbuf, int flag, va_list ap)
 				ttputc(CCHR('M'));
 				ttflush();
 			}
-#ifndef NO_MACRO
 			if (macrodef) {
 				struct line	*lp;
 
@@ -356,7 +347,6 @@ veread(const char *fp, char *buf, size_t nbuf, int flag, va_list ap)
 				maclcur = lp;
 				bcopy(buf, lp->l_text, cpos);
 			}
-#endif /* !NO_MACRO */
 			ret = buf;
 			goto done;
 		case CCHR('G'):			/* bell, abort */
@@ -779,10 +769,9 @@ ewprintf(const char *fmt, ...)
 {
 	va_list	 ap;
 
-#ifndef NO_MACRO
 	if (inmacro)
 		return;
-#endif /* !NO_MACRO */
+
 	va_start(ap, fmt);
 	ttcolor(CTEXT);
 	ttmove(nrow - 1, 0);
diff --git a/usr.bin/mg/extend.c b/usr.bin/mg/extend.c
index b4567886647..e6334962f01 100644
--- a/usr.bin/mg/extend.c
+++ b/usr.bin/mg/extend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extend.c,v 1.51 2011/01/21 19:10:13 kjell Exp $	*/
+/*	$OpenBSD: extend.c,v 1.52 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -13,17 +13,13 @@
 #include <sys/types.h>
 #include <ctype.h>
 
-#ifndef NO_MACRO
 #include "macro.h"
-#endif /* !NO_MACRO */
 
 #ifdef	FKEYS
 #include "key.h"
-#ifndef	NO_STARTUP
 #ifndef	BINDKEY
 #define	BINDKEY			/* bindkey is used by FKEYS startup code */
 #endif /* !BINDKEY */
-#endif /* !NO_STARTUP */
 #endif /* FKEYS */
 
 #include <ctype.h>
@@ -46,7 +42,6 @@ int
 insert(int f, int n)
 {
 	char	 buf[128], *bufp, *cp;
-#ifndef NO_MACRO
 	int	 count, c;
 
 	if (inmacro) {
@@ -63,7 +58,7 @@ insert(int f, int n)
 	if (n == 1)
 		/* CFINS means selfinsert can tack on the end */
 		thisflag |= CFINS;
-#endif /* !NO_MACRO */
+
 	if ((bufp = eread("Insert: ", buf, sizeof(buf), EFNEW)) == NULL)
 		return (ABORT);
 	else if (bufp[0] == '\0')
@@ -338,7 +333,6 @@ dobind(KEYMAP *curmap, const char *p, int unbind)
 	char	 bprompt[80], *bufp, *pep;
 	int	 c, s, n;
 
-#ifndef NO_MACRO
 	if (macrodef) {
 		/*
 		 * Keystrokes aren't collected. Not hard, but pretty useless.
@@ -347,7 +341,6 @@ dobind(KEYMAP *curmap, const char *p, int unbind)
 		ewprintf("Can't rebind key in macro");
 		return (FALSE);
 	}
-#ifndef NO_STARTUP
 	if (inmacro) {
 		for (s = 0; s < maclcur->l_used - 1; s++) {
 			if (doscan(curmap, c = CHARMASK(maclcur->l_text[s]), &curmap)
@@ -360,8 +353,6 @@ dobind(KEYMAP *curmap, const char *p, int unbind)
 		(void)doscan(curmap, c = maclcur->l_text[s], NULL);
 		maclcur = maclcur->l_fp;
 	} else {
-#endif /* !NO_STARTUP */
-#endif /* !NO_MACRO */
 		n = strlcpy(bprompt, p, sizeof(bprompt));
 		if (n >= sizeof(bprompt))
 			n = sizeof(bprompt) - 1;
@@ -376,9 +367,7 @@ dobind(KEYMAP *curmap, const char *p, int unbind)
 			*pep++ = '-';
 			*pep = '\0';
 		}
-#ifndef NO_STARTUP
 	}
-#endif /* !NO_STARTUP */
 	if (unbind)
 		funct = rescan;
 	else {
@@ -565,7 +554,6 @@ extend(int f, int n)
 	else if (bufp[0] == '\0')
 		return (FALSE);
 	if ((funct = name_function(bufp)) != NULL) {
-#ifndef NO_MACRO
 		if (macrodef) {
 			struct line	*lp = maclcur;
 			macro[macrocount - 1].m_funct = funct;
@@ -573,14 +561,12 @@ extend(int f, int n)
 			maclcur->l_fp = lp->l_fp;
 			free(lp);
 		}
-#endif /* !NO_MACRO */
 		return ((*funct)(f, n));
 	}
 	ewprintf("[No match]");
 	return (FALSE);
 }
 
-#ifndef NO_STARTUP
 /*
  * Define the commands needed to do startup-file processing.
  * This code is mostly a kludge just so we can get startup-file processing.
@@ -973,4 +959,3 @@ parsetoken(char *s)
 		} while (*++s != '"' && *s != '\0');
 	return (s);
 }
-#endif /* !NO_STARTUP */
diff --git a/usr.bin/mg/fileio.c b/usr.bin/mg/fileio.c
index fec2b99fa8d..53b2acb8d65 100644
--- a/usr.bin/mg/fileio.c
+++ b/usr.bin/mg/fileio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fileio.c,v 1.86 2012/03/28 17:16:53 lum Exp $	*/
+/*	$OpenBSD: fileio.c,v 1.87 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -336,7 +336,6 @@ adjustname(const char *fn, int slashslash)
 	return (fnb);
 }
 
-#ifndef NO_STARTUP
 /*
  * Find a startup file for the user and return its name. As a service
  * to other pieces of code that may want to find a startup file (like
@@ -383,7 +382,6 @@ nohome:
 #endif /* STARTUPFILE */
 	return (NULL);
 }
-#endif /* !NO_STARTUP */
 
 int
 copy(char *frname, char *toname)
diff --git a/usr.bin/mg/funmap.c b/usr.bin/mg/funmap.c
index 3a1132b0fbb..696be91130b 100644
--- a/usr.bin/mg/funmap.c
+++ b/usr.bin/mg/funmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: funmap.c,v 1.37 2012/04/11 17:51:10 lum Exp $	*/
+/*	$OpenBSD: funmap.c,v 1.38 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain */
 
@@ -35,9 +35,7 @@ static struct funmap functnames[] = {
 	{bsmap, "bsmap-mode",},
 	{NULL, "c-x 4 prefix",},
 	{NULL, "c-x prefix",},
-#ifndef NO_MACRO
 	{executemacro, "call-last-kbd-macro",},
-#endif /* !NO_MACRO */
 	{capword, "capitalize-word",},
 	{changedir, "cd",},
 	{clearmark, "clear-mark",},
@@ -65,18 +63,14 @@ static struct funmap functnames[] = {
 	{lowerregion, "downcase-region",},
 	{lowerword, "downcase-word",},
 	{showversion, "emacs-version",},
-#ifndef NO_MACRO
 	{finishmacro, "end-kbd-macro",},
-#endif /* !NO_MACRO */
 	{globalwdtoggle, "global-wd-mode",},
 	{gotoeob, "end-of-buffer",},
 	{gotoeol, "end-of-line",},
 	{enlargewind, "enlarge-window",},
 	{NULL, "esc prefix",},
-#ifndef NO_STARTUP
 	{evalbuffer, "eval-current-buffer",},
 	{evalexpr, "eval-expression",},
-#endif /* !NO_STARTUP */
 	{swapmark, "exchange-point-and-mark",},
 	{extend, "execute-extended-command",},
 	{fillpara, "fill-paragraph",},
@@ -107,9 +101,7 @@ static struct funmap functnames[] = {
 	{delfword, "kill-word",},
 	{linenotoggle, "line-number-mode",},
 	{listbuffers, "list-buffers",},
-#ifndef NO_STARTUP
 	{evalfile, "load",},
-#endif /* !NO_STARTUP */
 	{localbind, "local-set-key",},
 	{localunbind, "local-unset-key",},
 	{makebkfile, "make-backup-files",},
@@ -173,9 +165,7 @@ static struct funmap functnames[] = {
 	{space_to_tabstop, "space-to-tabstop",},
 #endif /* NOTAB */
 	{splitwind, "split-window-vertically",},
-#ifndef NO_MACRO
 	{definemacro, "start-kbd-macro",},
-#endif /* !NO_MACRO */
 	{spawncli, "suspend-emacs",},
 	{usebuffer, "switch-to-buffer",},
 	{poptobuffer, "switch-to-buffer-other-window",},
diff --git a/usr.bin/mg/help.c b/usr.bin/mg/help.c
index b42b5273a47..938f813d402 100644
--- a/usr.bin/mg/help.c
+++ b/usr.bin/mg/help.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: help.c,v 1.33 2012/03/14 13:56:35 lum Exp $	*/
+/*	$OpenBSD: help.c,v 1.34 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -11,9 +11,7 @@
 
 #include "kbd.h"
 #include "key.h"
-#ifndef NO_MACRO
 #include "macro.h"
-#endif /* !NO_MACRO */
 
 static int	showall(struct buffer *, KEYMAP *, char *);
 static int	findbind(KEYMAP *, PF, char *, size_t);
@@ -32,10 +30,9 @@ desckey(int f, int n)
 	char	*pep;
 	char	 dprompt[80];
 
-#ifndef NO_MACRO
 	if (inmacro)
 		return (TRUE);	/* ignore inside keyboard macro */
-#endif /* !NO_MACRO */
+
 	num = strlcpy(dprompt, "Describe key briefly: ", sizeof(dprompt));
 	if (num >= sizeof(dprompt))
 		num = sizeof(dprompt) - 1;
@@ -165,10 +162,10 @@ help_help(int f, int n)
 	do {
 		funct = doscan(kp, getkey(FALSE), NULL);
 	} while (funct == NULL || funct == help_help);
-#ifndef NO_MACRO
+
 	if (macrodef && macrocount < MAXMACRO)
 		macro[macrocount - 1].m_funct = funct;
-#endif /* !NO_MACRO */
+
 	return ((*funct)(f, n));
 }
 
diff --git a/usr.bin/mg/kbd.c b/usr.bin/mg/kbd.c
index c0bd9e836aa..0eb3c360853 100644
--- a/usr.bin/mg/kbd.c
+++ b/usr.bin/mg/kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbd.c,v 1.24 2008/06/14 07:38:53 kjell Exp $	*/
+/*	$OpenBSD: kbd.c,v 1.25 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -9,10 +9,7 @@
 #include "def.h"
 #include "kbd.h"
 #include "key.h"
-
-#ifndef NO_MACRO
 #include "macro.h"
-#endif /* !NO_MACRO */
 
 #ifndef METABIT
 #define METABIT 0x80
@@ -160,10 +157,10 @@ doin(void)
 	while ((funct = doscan(curmap, (key.k_chars[key.k_count++] =
 	    getkey(TRUE)), &curmap)) == NULL)
 		/* nothing */;
-#ifndef NO_MACRO
+
 	if (macrodef && macrocount < MAXMACRO)
 		macro[macrocount++].m_funct = funct;
-#endif /* !NO_MACRO */
+
 	return (mgwrap(funct, 0, 1));
 }
 
@@ -192,12 +189,9 @@ rescan(int f, int n)
 					    getkey(TRUE), &curmap)) == NULL)
 						/* nothing */;
 				if (fp != rescan) {
-#ifndef NO_MACRO
 					if (macrodef && macrocount <= MAXMACRO)
 						macro[macrocount - 1].m_funct
 						    = fp;
-#endif /* !NO_MACRO */
-
 					return (mgwrap(fp, f, n));
 				}
 			}
@@ -217,10 +211,8 @@ rescan(int f, int n)
 			key.k_count = i;
 		}
 		if (fp != rescan && i >= key.k_count - 1) {
-#ifndef NO_MACRO
 			if (macrodef && macrocount <= MAXMACRO)
 				macro[macrocount - 1].m_funct = fp;
-#endif /* !NO_MACRO */
 			return (mgwrap(fp, f, n));
 		}
 	}
@@ -247,14 +239,12 @@ universal_argument(int f, int n)
 			key.k_chars[key.k_count++] = c = getkey(TRUE);
 		}
 		if (funct != universal_argument) {
-#ifndef NO_MACRO
 			if (macrodef && macrocount < MAXMACRO - 1) {
 				if (f & FFARG)
 					macrocount--;
 				macro[macrocount++].m_count = nn;
 				macro[macrocount++].m_funct = funct;
 			}
-#endif /* !NO_MACRO */
 			return (mgwrap(funct, FFUNIV, nn));
 		}
 		nn <<= 2;
@@ -283,7 +273,6 @@ digit_argument(int f, int n)
 	while ((funct = doscan(curmap, c, &curmap)) == NULL) {
 		key.k_chars[key.k_count++] = c = getkey(TRUE);
 	}
-#ifndef NO_MACRO
 	if (macrodef && macrocount < MAXMACRO - 1) {
 		if (f & FFARG)
 			macrocount--;
@@ -292,7 +281,6 @@ digit_argument(int f, int n)
 		macro[macrocount++].m_count = nn;
 		macro[macrocount++].m_funct = funct;
 	}
-#endif /* !NO_MACRO */
 	return (mgwrap(funct, FFOTHARG, nn));
 }
 
@@ -321,7 +309,6 @@ negative_argument(int f, int n)
 	while ((funct = doscan(curmap, c, &curmap)) == NULL) {
 		key.k_chars[key.k_count++] = c = getkey(TRUE);
 	}
-#ifndef NO_MACRO
 	if (macrodef && macrocount < MAXMACRO - 1) {
 		if (f & FFARG)
 			macrocount--;
@@ -330,7 +317,6 @@ negative_argument(int f, int n)
 		macro[macrocount++].m_count = nn;
 		macro[macrocount++].m_funct = funct;
 	}
-#endif /* !NO_MACRO */
 	return (mgwrap(funct, FFNEGARG, nn));
 }
 
@@ -341,9 +327,7 @@ negative_argument(int f, int n)
 int
 selfinsert(int f, int n)
 {
-#ifndef NO_MACRO
 	struct line	*lp;
-#endif /* !NO_MACRO */
 	int	 c;
 	int	 count;
 
@@ -352,7 +336,7 @@ selfinsert(int f, int n)
 	if (n == 0)
 		return (TRUE);
 	c = key.k_chars[key.k_count - 1];
-#ifndef NO_MACRO
+
 	if (macrodef && macrocount < MAXMACRO) {
 		if (f & FFARG)
 			macrocount -= 2;
@@ -384,7 +368,6 @@ selfinsert(int f, int n)
 		}
 		thisflag |= CFINS;
 	}
-#endif /* !NO_MACRO */
 	if (c == '\n') {
 		do {
 			count = lnewline();
diff --git a/usr.bin/mg/keymap.c b/usr.bin/mg/keymap.c
index 5bd97a920b2..54134242a23 100644
--- a/usr.bin/mg/keymap.c
+++ b/usr.bin/mg/keymap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keymap.c,v 1.48 2012/04/11 17:51:10 lum Exp $	*/
+/*	$OpenBSD: keymap.c,v 1.49 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -101,12 +101,10 @@ static PF cXcL[] = {
 	swapmark		/* ^X */
 };
 
-#ifndef NO_MACRO
 static PF cXlp[] = {
 	definemacro,		/* ( */
 	finishmacro		/* ) */
 };
-#endif /* !NO_MACRO */
 
 static PF cX0[] = {
 	delwind,		/* 0 */
@@ -128,11 +126,7 @@ static PF cXcar[] = {
 	usebuffer,		/* b */
 	rescan,			/* c */
 	rescan,			/* d */
-#ifndef NO_MACRO
 	executemacro,		/* e */
-#else /* !NO_MACRO */
-	rescan,			/* e */
-#endif /* !NO_MACRO */
 	setfillcol,		/* f */
 	gotoline,		/* g */
 	markbuffer,		/* h */
@@ -151,15 +145,9 @@ static PF cXcar[] = {
 	undo			/* u */
 };
 
-#ifndef NO_MACRO
 struct KEYMAPE (6 + IMAPEXT) cXmap = {
 	6,
 	6 + IMAPEXT,
-#else /* !NO_MACRO */
-static struct KEYMAPE (5 + IMAPEXT) cXmap = {
-	5,
-	5 + IMAPEXT,
-#endif /* !NO_MACRO */
 	rescan,
 	{
 		{
@@ -168,11 +156,9 @@ static struct KEYMAPE (5 + IMAPEXT) cXmap = {
 		{
 			CCHR('L'), CCHR('X'), cXcL, NULL
 		},
-#ifndef NO_MACRO
 		{
 			'(', ')', cXlp, NULL
 		},
-#endif /* !NO_MACRO */
 		{
 			'0', '4', cX0, (KEYMAP *) & cX4map
 		},
diff --git a/usr.bin/mg/macro.c b/usr.bin/mg/macro.c
index 9f95bbfeff5..19104783017 100644
--- a/usr.bin/mg/macro.c
+++ b/usr.bin/mg/macro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macro.c,v 1.13 2008/06/10 02:39:22 kjell Exp $	*/
+/*	$OpenBSD: macro.c,v 1.14 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -6,7 +6,6 @@
  *	Keyboard macros.
  */
 
-#ifndef NO_MACRO
 #include "def.h"
 #include "key.h"
 #include "macro.h"
@@ -105,4 +104,3 @@ executemacro(int f, int n)
 	inmacro = FALSE;
 	return (TRUE);
 }
-#endif	/* NO_MACRO */
diff --git a/usr.bin/mg/main.c b/usr.bin/mg/main.c
index f80e1f9341d..ce5f4049c51 100644
--- a/usr.bin/mg/main.c
+++ b/usr.bin/mg/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.63 2012/01/26 04:14:11 lum Exp $	*/
+/*	$OpenBSD: main.c,v 1.64 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -9,10 +9,7 @@
 #include "def.h"
 #include "kbd.h"
 #include "funmap.h"
-
-#ifndef NO_MACRO
 #include "macro.h"
-#endif	/* NO_MACRO */
 
 #include <err.h>
 
@@ -101,11 +98,9 @@ main(int argc, char **argv)
 	 */
 	update();
 
-#ifndef NO_STARTUP
 	/* user startup file */
 	if ((cp = startupfile(NULL)) != NULL)
 		(void)load(cp);
-#endif	/* !NO_STARTUP */
 
 	/*
 	 * Create scratch buffer now, killing old *init* buffer.
@@ -184,9 +179,7 @@ notnum:
 		case FALSE:
 		default:
 			ttbeep();
-#ifndef NO_MACRO
 			macrodef = FALSE;
-#endif	/* !NO_MACRO */
 		}
 	}
 }
diff --git a/usr.bin/mg/search.c b/usr.bin/mg/search.c
index 4278cbe0c12..1226cb6e144 100644
--- a/usr.bin/mg/search.c
+++ b/usr.bin/mg/search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.38 2011/01/21 19:10:13 kjell Exp $	*/
+/*	$OpenBSD: search.c,v 1.39 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -15,9 +15,7 @@
 
 #include <ctype.h>
 
-#ifndef NO_MACRO
 #include "macro.h"
-#endif /* !NO_MACRO */
 
 #define SRCH_BEGIN	(0)	/* Search sub-codes.	 */
 #define SRCH_FORW	(-1)
@@ -175,12 +173,10 @@ isearch(int dir)
 	char		 opat[NPAT];
 	int		 cdotline;	/* Saved line number */
 
-#ifndef NO_MACRO
 	if (macrodef) {
 		ewprintf("Can't isearch in macro");
 		return (FALSE);
 	}
-#endif /* !NO_MACRO */
 	for (cip = 0; cip < NSRCH; cip++)
 		cmds[cip].s_code = SRCH_NOPR;
 
@@ -553,12 +549,10 @@ queryrepl(int f, int n)
 	int	plen;			/* length of found string	*/
 	char	news[NPAT], *rep;	/* replacement string		*/
 
-#ifndef NO_MACRO
 	if (macrodef) {
 		ewprintf("Can't query replace in macro");
 		return (FALSE);
 	}
-#endif /* !NO_MACRO */
 
 	if ((s = readpattern("Query replace")) != TRUE)
 		return (s);
diff --git a/usr.bin/mg/ttykbd.c b/usr.bin/mg/ttykbd.c
index fad9079f77c..a160a3ef896 100644
--- a/usr.bin/mg/ttykbd.c
+++ b/usr.bin/mg/ttykbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ttykbd.c,v 1.15 2012/03/28 17:35:03 lum Exp $	*/
+/*	$OpenBSD: ttykbd.c,v 1.16 2012/04/12 04:47:59 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -59,12 +59,10 @@ ttykeymapinit(void)
 		dobindkey(fundamental_map, "delete-char", key_dc);
 #endif /* FKEYS */
 
-#ifndef	NO_STARTUP
 	if ((cp = getenv("TERM"))) {
 		if (((cp = startupfile(cp)) != NULL) && (load(cp) != TRUE))
 			ewprintf("Error reading key initialization file");
 	}
-#endif /* !NO_STARTUP */
 	if (keypad_xmit)
 		/* turn on keypad */
 		putpad(keypad_xmit, 1);