===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/keymap.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- src/usr.bin/mg/keymap.c	2011/11/28 04:41:39	1.46
+++ src/usr.bin/mg/keymap.c	2012/03/14 13:56:35	1.47
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keymap.c,v 1.46 2011/11/28 04:41:39 lum Exp $	*/
+/*	$OpenBSD: keymap.c,v 1.47 2012/03/14 13:56:35 lum Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -14,7 +14,6 @@
  * initial keymap declarations, deepest first
  */
 
-#ifndef NO_HELP
 static PF cHcG[] = {
 	ctrlg,			/* ^G */
 	help_help		/* ^H */
@@ -39,7 +38,6 @@
 		}
 	}
 };
-#endif /* !NO_HELP */
 
 struct KEYMAPE (1 + IMAPEXT) ccmap = {
 	1,
@@ -327,11 +325,7 @@
 };
 
 static PF fund_h[] = {
-#ifndef NO_HELP
 	NULL,			/* ^H */
-#else /* !NO_HELP */
-	rescan,			/* ^H */
-#endif /* !NO_HELP */
 };
 
 
@@ -384,16 +378,10 @@
 		{
 			CCHR('@'), CCHR('G'), fund_at, (KEYMAP *) & ccmap
 		},
-#ifndef NO_HELP
 		{
 			CCHR('H'), CCHR('H'), fund_h, (KEYMAP *) & helpmap
 		},
-#else /* !NO_HELP */
 		{
-			CCHR('@'), CCHR('H'), fund_h, NULL
-		},
-#endif /* !NO_HELP */
-		{
 			CCHR('J'), CCHR('Z'), fund_CJ, (KEYMAP *) & cXmap
 		},
 		{
@@ -496,9 +484,7 @@
 	{(KEYMAP *) &metamap, "esc prefix",},
 	{(KEYMAP *) &cXmap, "c-x prefix",},
 	{(KEYMAP *) &cX4map, "c-x 4 prefix",},
-#ifndef NO_HELP
 	{(KEYMAP *) &helpmap, "help",},
-#endif
 	{NULL, NULL}
 };