snapshot of project "lynx", label v2-8-8dev_8i

14 files changed, 102 insertions, 93 deletions

diff --git a/src/LYEditmap.c b/src/LYEditmap.c
index 04fdee7f..7e748748 100644
--- a/src/LYEditmap.c
+++ b/src/LYEditmap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYEditmap.c,v 1.27 2008/09/07 23:00:47 tom Exp $
+ * $LynxId: LYEditmap.c,v 1.28 2011/05/28 13:07:55 tom Exp $
  *
  * LYEditMap.c
  * Keybindings for line and form editting.
@@ -11,7 +11,7 @@
 #include <LYKeymap.h>		/* KEYMAP_SIZE, LKC_*, LYK_* - kw */
 
 /* * * * * LynxEditactionCodes * * * * */
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
 
 /* Last valid index for the (lynxkeycode+modifier -> lynxeditactioncode)
  * tables.  Currently all three tables are the same.  - kw
@@ -26,7 +26,7 @@
 #define LKC_TO_LEC_M2(c) ((c)>LAST_MOD2_LKC? (int)LYE_UNMOD: Mod2Binding[c])
 #define LKC_TO_LEC_M3(c) ((c)>LAST_MOD3_LKC? (int)LYE_UNMOD: Mod3Binding[c])
 
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
 
 int current_lineedit = 0;	/* Index into LYLineEditors[]   */
 
@@ -281,7 +281,7 @@ LYE_NOP,        LYE_NOP,        LYE_NOP,        LYE_NOP,
              /*                 ^^=upper-case-line,  ^_=lower-case-line   */
 /* Why the difference for tab? - kw */
 
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
 static LYEditCode BetterEditBinding[KEYMAP_SIZE-1]={
 
 LYE_NOP,        LYE_BOL,        LYE_BACK,       LYE_ABORT,
@@ -923,7 +923,7 @@ LYE_UNMOD,      LYE_UNMOD,
 static short *Mod2Binding = Mod1Binding;
 static short *Mod3Binding = Mod1Binding;
 
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
 /* *INDENT-ON* */
 
 /*
@@ -933,7 +933,7 @@ static short *Mod3Binding = Mod1Binding;
 LYEditCode *LYLineEditors[] =
 {
     DefaultEditBinding,		/* You can't please everyone, so you ... DW */
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     BetterEditBinding,		/* No, you certainly can't ... /ked 10/27/98 */
     BashlikeEditBinding,	/* and one more... - kw 1999-02-15 */
 #endif
@@ -946,7 +946,7 @@ LYEditCode *LYLineEditors[] =
 const char *LYLineeditNames[] =
 {
     "Default Binding",
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     "Alternate Bindings",
     "Bash-like Bindings",
 #endif
@@ -962,7 +962,7 @@ const char *LYLineeditNames[] =
 const char *LYLineeditHelpURLs[] =
 {
     EDIT_HELP,
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     ALT_EDIT_HELP,
     BASHLIKE_EDIT_HELP,
 #endif
@@ -981,7 +981,7 @@ int EditBinding(int xlkc)
 	c = TOASCII(c);
     }
 #endif
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     /*
      * Get intermediate code from one of the lynxkeycode+modifier tables if
      * applicable, otherwise get the lynxeditactioncode directly.  If we have
@@ -1033,7 +1033,7 @@ BOOL LYRemapEditBinding(int xlkc,
 
     if (xlkc < 0 || (xlkc & LKC_ISLAC) || c >= KEYMAP_SIZE + 1)
 	return FALSE;
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     if (xlkc & LKC_MOD1) {
 	if (c > LAST_MOD1_LKC)
 	    return FALSE;
@@ -1053,7 +1053,7 @@ BOOL LYRemapEditBinding(int xlkc,
 	    Mod3Binding[c] = (short) lec;
 	return TRUE;
     } else
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
     {
 #ifndef UCHAR_MAX
 #define UCHAR_MAX 255
@@ -1165,7 +1165,7 @@ int LYEditKeyForAction(int lac,
 	if ((editaction & LYE_DF) && mod3found < 0)
 	    mod3found = i;
     }
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     if (mod3found >= 0) {
 	for (i = mod3found; i >= 0; i = NEXT_I(i, LAST_MOD3_LKC)) {
 	    editaction = CurrentLineEditor()[i];
@@ -1280,7 +1280,7 @@ int LYEditKeyForAction(int lac,
 	    }
 	}
     }
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
     if (pmodkey)
 	*pmodkey = -1;
     return (-1);
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index c72dbb38..ea3e7e04 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYGlobalDefs.h,v 1.129 2011/05/27 08:39:07 tom Exp $
+ * $LynxId: LYGlobalDefs.h,v 1.130 2011/05/27 21:26:14 tom Exp $
  *
  * global variable definitions
  */
@@ -672,6 +672,14 @@ extern "C" {
 	cygwin32_conv_to_full_posix_path(p, q)
 #endif
 
+#ifdef __CYGWIN__
+#define ConvertToWin32Path(p, q) \
+	cygwin_conv_to_full_win32_path(p, q);
+#else
+#define ConvertToWin32Path(p, q) \
+	q = p
+#endif
+
 #ifdef USE_SCROLLBAR
 /* GridText.c */
     extern BOOLEAN LYShowScrollbar;
diff --git a/src/LYHistory.c b/src/LYHistory.c
index b970dec1..5ac35038 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYHistory.c,v 1.80 2010/09/25 11:22:51 tom Exp $
+ * $LynxId: LYHistory.c,v 1.81 2011/05/28 13:05:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -130,7 +130,7 @@ void LYAddVisitedLink(DocInfo *doc)
 	    LYIsUIPage(doc->address, UIP_OPTIONS_MENU) ||
 	    isLYNXKEYMAP(doc->address) ||
 	    LYIsUIPage(doc->address, UIP_LIST_PAGE) ||
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 	    LYIsUIPage(doc->address, UIP_ADDRLIST_PAGE) ||
 #endif
 	    LYIsUIPage(doc->address, UIP_CONFIG_DEF) ||
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index 90cd3c44..d6d764a1 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.74 2011/05/26 23:24:42 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.75 2011/05/28 13:05:14 tom Exp $ */
 #include <HTUtils.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
@@ -898,7 +898,7 @@ static Kcmd revmap[] = {
     DATA(
 	LYK_INSERT_FILE, "INSERTFILE",
 	"insert file into a textarea (just above cursorline)" ),
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
     DATA(
 	LYK_ADDRLIST, "ADDRLIST",
 	"like LIST command, but always shows the links' URLs" ),
diff --git a/src/LYKeymap.h b/src/LYKeymap.h
index ae263074..a0cb53dd 100644
--- a/src/LYKeymap.h
+++ b/src/LYKeymap.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.h,v 1.42 2010/09/25 11:35:30 tom Exp $ */
+/* $LynxId: LYKeymap.h,v 1.43 2011/05/28 13:05:14 tom Exp $ */
 #ifndef LYKEYMAP_H
 #define LYKEYMAP_H
 
@@ -200,7 +200,7 @@ extern "C" {
 	,LYK_GROW_TEXTAREA
 	,LYK_INSERT_FILE
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 	,LYK_ADDRLIST
 #else
 #define LYK_ADDRLIST      LYK_ADD_BOOKMARK
diff --git a/src/LYList.c b/src/LYList.c
index 1f316b97..5cd12a45 100644
--- a/src/LYList.c
+++ b/src/LYList.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYList.c,v 1.49 2010/10/03 17:09:22 tom Exp $
+ * $LynxId: LYList.c,v 1.50 2011/05/28 13:05:14 tom Exp $
  *
  *			Lynx Document Reference List Support	      LYList.c
  *			====================================
@@ -76,7 +76,7 @@ int showlist(DocInfo *newdoc, int titles)
     LYforce_HTML_mode = TRUE;	/* force this file to be HTML */
     LYforce_no_cache = TRUE;	/* force this file to be new */
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
     if (titles != TRUE)
 	BeginInternalPage(fp0, ADDRLIST_PAGE_TITLE, LIST_PAGE_HELP);
     else
diff --git a/src/LYMail.c b/src/LYMail.c
index 188bf144..42666cef 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMail.c,v 1.83 2011/05/27 08:51:44 tom Exp $
+ * $LynxId: LYMail.c,v 1.87 2011/05/27 23:14:46 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTParse.h>
@@ -320,8 +320,7 @@ Blat <filename> -t <recipient> [optional switches (see below)]
 
 */
 
-static char *blat_cmd(char *mail_cmd,
-		      char *filename,
+static char *blat_cmd(char *filename,
 		      char *address,
 		      char *subject,
 		      char *ccaddr,
@@ -330,24 +329,30 @@ static char *blat_cmd(char *mail_cmd,
     char *b_cmd = NULL;
 
     if (mail_is_altblat) {
+	const char *format = "%s %s -t %s -s %s %s%s%s";
 
-	HTSprintf0(&b_cmd, "%s %s -t \"%s\" -s \"%s\" %s%s%s%s",
-		   mail_cmd,
-		   filename,
-		   address,
-		   subject,
-		   system_mail_flags,
-		   ccaddr ? " -c \"" : "",
-		   NonNull(ccaddr),
-		   ccaddr ? "\"" : "");
+	HTAddParam(&b_cmd, format, 1, ALTBLAT_MAIL);
+	HTAddParam(&b_cmd, format, 2, filename);
+	HTAddParam(&b_cmd, format, 3, address);
+	HTAddParam(&b_cmd, format, 4, subject);
+	HTAddToCmd(&b_cmd, format, 5, ALTBLAT_MAIL_FLAGS);
+	if (non_empty(ccaddr)) {
+	    HTAddToCmd(&b_cmd, format, 6, " -c ");
+	    HTAddParam(&b_cmd, format, 7, NonNull(ccaddr));
+	}
+	HTEndParam(&b_cmd, format, 8);
 
     } else {
 
+	const char *format = "%s @%s";
 	char bl_cmd_file[LY_MAXPATH];
 	FILE *fp;
 
 #ifdef __CYGWIN__
 	char dosname[LY_MAXPATH];
+
+#else
+	char *dosname;
 #endif
 
 	bl_cmd_file[0] = '\0';
@@ -355,12 +360,12 @@ static char *blat_cmd(char *mail_cmd,
 	    HTAlert(FORM_MAILTO_FAILED);
 	    return NULL;
 	}
-#ifdef __CYGWIN__
-	cygwin_conv_to_full_win32_path(filename, dosname);
+
+	HTAddParam(&b_cmd, format, 1, BLAT_MAIL);
+
+	ConvertToWin32Path(filename, dosname);
 	fprintf(fp, "%s\n", dosname);
-#else
-	fprintf(fp, "%s\n", filename);
-#endif
+
 	fprintf(fp, "-t\n%s\n", address);
 	if (subject)
 	    fprintf(fp, "-s\n%s\n", subject);
@@ -372,12 +377,10 @@ static char *blat_cmd(char *mail_cmd,
 	}
 	LYCloseOutput(fp);
 
-#ifdef __CYGWIN__
-	cygwin_conv_to_full_win32_path(bl_cmd_file, dosname);
-	HTSprintf0(&b_cmd, "%s \"@%s\"", mail_cmd, dosname);
-#else
-	HTSprintf0(&b_cmd, "%s @%s", mail_cmd, bl_cmd_file);
-#endif
+	ConvertToWin32Path(bl_cmd_file, dosname);
+
+	HTAddParam(&b_cmd, format, 2, dosname);
+	HTEndParam(&b_cmd, format, 3);
 
     }
 
@@ -474,8 +477,7 @@ int LYSendMailFile(char *the_address,
 
 #if USE_BLAT_MAILER
     if (mail_is_blat) {
-	cmd = blat_cmd(system_mail,
-		       the_filename,
+	cmd = blat_cmd(the_filename,
 		       the_address,
 		       the_subject,
 		       the_ccaddr,
@@ -484,25 +486,32 @@ int LYSendMailFile(char *the_address,
 #endif
 #ifdef __DJGPP__
     if (LYGetEnv("SHELL")) {
+	extern int dj_is_bash;
+	extern char *shell;
+	const char *c_option;
+	const char *format = "%s %s %s -t %s -F %s";
+
 	if (dj_is_bash) {
-	    HTSprintf0(&cmd, "%s -c %s -t \"%s\" -F %s",
-		       shell,
-		       system_mail,
-		       the_address,
-		       the_filename);
+	    c_option = "-c";
 	} else {
-	    HTSprintf0(&cmd, "%s /c %s -t \"%s\" -F %s",
-		       shell,
-		       system_mail,
-		       the_address,
-		       the_filename);
+	    c_option = "/c";
 	}
+	HTAddParam(&cmd, format, 1, shell);
+	HTAddParam(&cmd, format, 2, c_option);
+	HTAddParam(&cmd, format, 3, system_mail);
+	HTAddParam(&cmd, format, 4, the_address);
+	HTAddParam(&cmd, format, 5, the_filename);
+	HTEndParam(&cmd, format, 6);
     } else
 #endif /* __DJGPP__ */
-	HTSprintf0(&cmd, "%s -t \"%s\" -F %s",
-		   system_mail,
-		   the_address,
-		   the_filename);
+    {
+	const char *format = "%s -t %s -F %s";
+
+	HTAddParam(&cmd, format, 1, system_mail);
+	HTAddParam(&cmd, format, 2, the_address);
+	HTAddParam(&cmd, format, 3, the_filename);
+	HTEndParam(&cmd, format, 4);
+    }
 
     stop_curses();
     SetOutputMode(O_TEXT);
diff --git a/src/LYMail.h b/src/LYMail.h
index 96d0fc9f..fb1df6a1 100644
--- a/src/LYMail.h
+++ b/src/LYMail.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMail.h,v 1.15 2011/05/27 09:54:07 tom Exp $
+ * $LynxId: LYMail.h,v 1.16 2011/05/27 23:18:26 tom Exp $
  */
 #ifndef LYMAIL_H
 #define LYMAIL_H
@@ -25,21 +25,13 @@ extern "C" {
 #define USE_BLAT_MAILER 0
 #endif
 
-#ifdef USE_BLAT_MAILER
-
-#undef SYSTEM_MAIL
-#undef SYSTEM_MAIL_FLAGS
-
-#ifdef USE_ALT_BLAT_MAILER
-#define SYSTEM_MAIL		ALTBLAT_MAIL
-#define SYSTEM_MAIL_FLAGS	""
-#else
-#define SYSTEM_MAIL		BLAT_MAIL
-#define SYSTEM_MAIL_FLAGS	""
-#define USE_ALT_BLAT_MAILER     0
+#ifndef ALTBLAT_MAIL_FLAGS
+#define ALTBLAT_MAIL_FLAGS ""
 #endif
 
-#endif				/* USE_BLAT_MAILER */
+#ifndef BLAT_MAIL_FLAGS
+#define BLAT_MAIL_FLAGS ""
+#endif
 
 #ifdef VMS
 #define USE_VMS_MAILER 1
diff --git a/src/LYMain.c b/src/LYMain.c
index 01b21c5d..19c93109 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.228 2011/05/27 09:51:51 tom Exp $
+ * $LynxId: LYMain.c,v 1.229 2011/05/27 22:55:56 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -3599,7 +3599,7 @@ soon as they are seen)"
 #if USE_BLAT_MAILER
    PARSE_SET(
       "noblat",		4|TOGGLE_ARG,		mail_is_blat,
-      "select mail tool (`"THIS_BLAT_MAIL"' ==> `sendmail')"
+      "select mail tool (`"THIS_BLAT_MAIL"' ==> `"SYSTEM_MAIL"')"
    ),
 #endif
    PARSE_FUN(
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 86511bd1..e45df3a9 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.173 2011/05/19 10:56:00 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.174 2011/05/28 13:05:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -1492,7 +1492,7 @@ static int handle_LYK_ACTIVATE(int *c,
     return 0;
 }
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 static BOOLEAN handle_LYK_ADDRLIST(int *cmd)
 {
     /*
@@ -1524,7 +1524,7 @@ static BOOLEAN handle_LYK_ADDRLIST(int *cmd)
     }
     return FALSE;
 }
-#endif /* EXP_ADDRLIST_PAGE */
+#endif /* USE_ADDRLIST_PAGE */
 
 static void handle_LYK_ADD_BOOKMARK(BOOLEAN *refresh_screen,
 				    int *old_c,
@@ -7292,12 +7292,12 @@ int mainloop(void)
 		goto new_cmd;
 	    break;
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 	case LYK_ADDRLIST:	/* always list URL's (only) */
 	    if (handle_LYK_ADDRLIST(&cmd))
 		goto new_cmd;
 	    break;
-#endif /* EXP_ADDRLIST_PAGE */
+#endif /* USE_ADDRLIST_PAGE */
 
 	case LYK_VLINKS:	/* list links visited during the current session */
 	    if (handle_LYK_VLINKS(&cmd, &newdoc_link_is_absolute))
diff --git a/src/LYStrings.h b/src/LYStrings.h
index c31360f1..b3b27af3 100644
--- a/src/LYStrings.h
+++ b/src/LYStrings.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStrings.h,v 1.78 2010/09/25 11:18:47 tom Exp $
+ * $LynxId: LYStrings.h,v 1.79 2011/05/28 13:07:55 tom Exp $
  */
 #ifndef LYSTRINGS_H
 #define LYSTRINGS_H
@@ -189,7 +189,7 @@ extern "C" {
 #define VISIBLE  0
 #define HIDDEN   1
 
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
 /*  Enable code implementing additional, mostly emacs-like, line-editing
     functions. - kw */
 #define ENHANCED_LINEEDIT
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 1a0aa7f1..a384edfe 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.208 2011/05/27 00:40:54 tom Exp $
+ * $LynxId: LYUtils.c,v 1.210 2011/05/28 13:05:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -2768,7 +2768,7 @@ BOOLEAN LYCloseInput(FILE *fp)
 	    result = TRUE;
 	}
     }
-    return result;
+    return (BOOLEAN) result;
 }
 
 /*
@@ -2793,7 +2793,7 @@ BOOLEAN LYCloseOutput(FILE *fp)
     if (!result) {
 	HTAlert(CANNOT_WRITE_TO_FILE);
     }
-    return result;
+    return (BOOLEAN) result;
 }
 
 /*
@@ -6492,7 +6492,7 @@ static uip_entry ly_uip[] =
   , { UIP_PERMIT_OPTIONS	, 0	      , NULL, NULL, NULL }
   , { UIP_UPLOAD_OPTIONS	, UIP_F_LMULTI, NULL, NULL, NULL }
 #endif
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
   , { UIP_ADDRLIST_PAGE		, UIP_F_LMULTI, NULL, NULL, NULL }
 #endif
   , { UIP_LYNXCFG		, UIP_F_LMULTI, NULL, NULL, NULL }
diff --git a/src/LYUtils.h b/src/LYUtils.h
index 780a70c3..042127c3 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYUtils.h,v 1.85 2010/09/24 09:58:04 tom Exp $ */
+/* $LynxId: LYUtils.h,v 1.86 2011/05/28 13:05:14 tom Exp $ */
 #ifndef LYUTILS_H
 #define LYUTILS_H
 
@@ -89,7 +89,7 @@ extern "C" {
 #define LYIsPathSep(ch) ((ch) == '/')
 #define LYIsDosDrive(s) FALSE	/* really nothing */
 #endif
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 #define LYIsListpageTitle(name) \
     (!strcmp((name), LIST_PAGE_TITLE) || \
      !strcmp((name), ADDRLIST_PAGE_TITLE))
diff --git a/src/makefile.dos b/src/makefile.dos
index ed0358db..54096765 100644
--- a/src/makefile.dos
+++ b/src/makefile.dos
@@ -1,4 +1,4 @@
-# $LynxId: makefile.dos,v 1.32 2008/06/30 23:53:42 tom Exp $
+# $LynxId: makefile.dos,v 1.33 2011/05/28 13:07:55 tom Exp $
 
 OBJS= UCdomap.o UCAux.o UCAuto.o \
 LYClean.o LYShowInfo.o LYEdit.o LYStrings.o \
@@ -34,8 +34,8 @@ MCFLAGS = \
  -DCOLOR_CURSES \
  -DDISP_PARTIAL \
  -DDOSPATH \
- -DEXP_ADDRLIST_PAGE \
- -DEXP_ALT_BINDINGS \
+ -DUSE_ADDRLIST_PAGE \
+ -DUSE_ALT_BINDINGS \
  -DEXP_NESTED_TABLES \
  -DUSE_PERSISTENT_COOKIES \
  -DFANCY_CURSES \