Get rid of PREFIXREGION ifdef, since we always enable it anyway.

no binary change.

3 files changed, 5 insertions, 20 deletions

diff --git a/usr.bin/mg/Makefile b/usr.bin/mg/Makefile
index 4b35bd669d0..2af8c742be7 100644
--- a/usr.bin/mg/Makefile
+++ b/usr.bin/mg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2005/11/22 05:02:44 kjell Exp $
+# $OpenBSD: Makefile,v 1.19 2006/12/16 17:00:03 kjell Exp $
 
 PROG=	mg
 
@@ -11,10 +11,9 @@ DPADD+=	${LIBCURSES}
 #	FKEYS		-- add support for function key sequences.
 #	XKEYS		-- use termcap function key definitions. Warning -
 #				XKEYS and bsmap mode do _not_ get along.
-#	PREFIXREGION	-- enable function "prefix-region"
 #	REGEX		-- create regular expression functions
 #
-CFLAGS+=-Wall -DPREFIXREGION -DXKEYS -DFKEYS -DREGEX
+CFLAGS+=-Wall -DXKEYS -DFKEYS -DREGEX
 
 SRCS=	cinfo.c fileio.c spawn.c ttyio.c tty.c ttykbd.c \
 	basic.c dir.c dired.c file.c line.c match.c paragraph.c \
diff --git a/usr.bin/mg/funmap.c b/usr.bin/mg/funmap.c
index 95ee3b271a9..17aa08e18c6 100644
--- a/usr.bin/mg/funmap.c
+++ b/usr.bin/mg/funmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: funmap.c,v 1.24 2006/06/01 09:00:50 kjell Exp $	*/
+/*	$OpenBSD: funmap.c,v 1.25 2006/12/16 17:00:03 kjell Exp $	*/
 /*
  * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>.  All rights reserved.
  *
@@ -148,9 +148,7 @@ static struct funmap functnames[] = {
 	{openline, "open-line",},
 	{nextwind, "other-window",},
 	{overwrite_mode, "overwrite-mode",},
-#ifdef PREFIXREGION
 	{prefixregion, "prefix-region",},
-#endif /* PREFIXREGION */
 	{backline, "previous-line",},
 	{prevwind, "previous-window",},
 	{spawncli, "push-shell",},
@@ -186,9 +184,7 @@ static struct funmap functnames[] = {
 	{set_default_mode, "set-default-mode",},
 	{setfillcol, "set-fill-column",},
 	{setmark, "set-mark-command",},
-#ifdef PREFIXREGION
 	{setprefix, "set-prefix-string",},
-#endif /* PREFIXREGION */
 	{shrinkwind, "shrink-window",},
 #ifdef NOTAB
 	{space_to_tabstop, "space-to-tabstop",},
diff --git a/usr.bin/mg/region.c b/usr.bin/mg/region.c
index 5996368fc4e..bb4a1e22a83 100644
--- a/usr.bin/mg/region.c
+++ b/usr.bin/mg/region.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: region.c,v 1.24 2006/07/25 08:22:32 kjell Exp $	*/
+/*	$OpenBSD: region.c,v 1.25 2006/12/16 17:00:03 kjell Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -240,15 +240,6 @@ setsize(struct region *rp, RSIZE size)
 	return (TRUE);
 }
 
-#ifdef PREFIXREGION
-/*
- * Implements one of my favorite keyboard macros; put a string at the
- * beginning of a number of lines in a buffer.	The quote string is
- * settable by using set-prefix-string.	 Great for quoting mail, which
- * is the real reason I wrote it, but also has uses for creating bar
- * comments (like the one you're reading) in C code.
- */
-
 #define PREFIXLENGTH 40
 static char	prefix_string[PREFIXLENGTH] = {'>', '\0'};
 
@@ -298,7 +289,7 @@ prefixregion(int f, int n)
 }
 
 /*
- * Set line prefix string.
+ * Set line prefix string. Used by prefixregion.
  */
 /* ARGSUSED */
 int
@@ -325,7 +316,6 @@ setprefix(int f, int n)
 		retval = FALSE;
 	return (retval);
 }
-#endif /* PREFIXREGION */
 
 int
 region_get_data(struct region *reg, char *buf, int len)