Use defines for internal mail variable names

20 files changed, 264 insertions, 167 deletions

diff --git a/mail/alias.c b/mail/alias.c
index e46cc9d30..b695ef627 100644
--- a/mail/alias.c
+++ b/mail/alias.c
@@ -144,13 +144,13 @@ string_comp (const void *item, const void *value)
 char *
 alias_expand (const char *name)
 {
   mu_list_t al;
   mu_list_t list;
   
-  if (mailvar_is_true ("recursivealiases"))
+  if (mailvar_is_true (mailvar_name_recursivealiases))
     {
       char *s;
       mu_list_t origlist;
       
       int status = mu_list_create (&list);
       if (status)
diff --git a/mail/decode.c b/mail/decode.c
index 15cfd09a5..869fe2f3b 100644
--- a/mail/decode.c
+++ b/mail/decode.c
@@ -241,13 +241,13 @@ mime_descend (struct mime_descend_closure *closure,
 
 static int
 display_submessage (struct mime_descend_closure *closure, void *data)
 {
   char *tmp;
   
-  if (mailvar_get (&tmp, "metamail", mailvar_type_string, 0) == 0)
+  if (mailvar_get (&tmp, mailvar_name_metamail, mailvar_type_string, 0) == 0)
     {
       /* If `metamail' is set to a string, treat it as command line
 	 of external metamail program. */
       run_metamail (tmp, closure->message);
     }
   else
@@ -277,17 +277,17 @@ display_submessage (struct mime_descend_closure *closure, void *data)
       display_part_header (mu_strout,
 			   closure->msgset,
 			   closure->type, closure->encoding);
       
       /* If `metamail' is set to true, enable internal mailcap
 	 support */
-      if (mailvar_is_true ("metamail"))
+      if (mailvar_is_true (mailvar_name_metamail))
 	{
 	  char *no_ask = NULL;
 	  
-	  mailvar_get (&no_ask, "mimenoask", mailvar_type_string, 0);
+	  mailvar_get (&no_ask, mailvar_name_mimenoask, mailvar_type_string, 0);
 	  builtin_display = display_stream_mailcap (NULL, stream, hdr, no_ask,
 						    interactive, 0,
 						    MU_DEBCAT_APP);
 	}
       
       if (builtin_display)
@@ -397,13 +397,14 @@ run_metamail (const char *mailcap_cmd, mu_message_t mesg)
       do /* Fake loop to avoid gotos */
 	{
 	  mu_stream_t pstr;
 	  char *no_ask;
 	  
 	  setenv ("METAMAIL_PAGER", getenv ("PAGER"), 0);
-	  if (mailvar_get (&no_ask, "mimenoask", mailvar_type_string, 0))
+	  if (mailvar_get (&no_ask, mailvar_name_mimenoask,
+			   mailvar_type_string, 0))
 	    setenv ("MM_NOASK", no_ask, 1);
 	  
 	  status = mu_message_get_streamref (mesg, &stream);
 	  if (status)
 	    {
 	      mu_error ("mu_message_get_streamref: %s", mu_strerror (status));
diff --git a/mail/delete.c b/mail/delete.c
index 1f2192f2d..344857246 100644
--- a/mail/delete.c
+++ b/mail/delete.c
@@ -34,12 +34,12 @@ mail_delete_msg (msgset_t *mspec, mu_message_t msg, void *data)
 int
 mail_delete (int argc, char **argv)
 {
   int rc = util_foreach_msg (argc, argv, MSG_NODELETED|MSG_SILENT,
 			     mail_delete_msg, NULL);
 
-  if (mailvar_is_true ("autoprint"))
+  if (mailvar_is_true (mailvar_name_autoprint))
     util_do_command("print");
 
   return rc;
 }
 
diff --git a/mail/escape.c b/mail/escape.c
index 4dffcd521..bb0f7f09d 100644
--- a/mail/escape.c
+++ b/mail/escape.c
@@ -66,22 +66,22 @@ int
 escape_check_args (int argc, char **argv, int minargs, int maxargs)
 {
   char *escape = "~";
   if (argc < minargs)
     {
       minargs--;
-      mailvar_get (&escape, "escape", mailvar_type_string, 0);
+      mailvar_get (&escape, mailvar_name_escape, mailvar_type_string, 0);
       mu_error (ngettext ("%c%s requires at least %d argument",
 			  "%c%s requires at least %d arguments",
 			  minargs), escape[0], argv[0], minargs);
       return 1;
     }
   if (maxargs > 1 && argc > maxargs)
     {
       maxargs--;
-      mailvar_get (&escape, "escape", mailvar_type_string, 0);
+      mailvar_get (&escape, mailvar_name_escape, mailvar_type_string, 0);
       mu_error (ngettext ("%c%s accepts at most %d argument",
 			  "%c%s accepts at most %d arguments",
 			  maxargs), escape[0], argv[0], maxargs);
       return 1;
     }
     
@@ -141,13 +141,15 @@ escape_help (int argc, char **argv, compose_env_t *env MU_ARG_UNUSED)
 /* ~a */
 int
 escape_sign (int argc MU_ARG_UNUSED, char **argv, compose_env_t *env)
 {
   char *p;
 
-  if (mailvar_get (&p, mu_isupper (argv[0][0]) ? "Sign" : "sign",
+  if (mailvar_get (&p,
+		   mu_isupper (argv[0][0])
+		      ? mailvar_name_Sign : mailvar_name_sign,
 		   mailvar_type_string, 1) == 0)
     {
       mu_stream_printf (env->compstr, "-- \n");
       if (mu_isupper (argv[0][0]))
 	{
 	  char *name = util_fullpath (p);
@@ -269,13 +271,13 @@ escape_run_editor (char *ed, int argc, char **argv, compose_env_t *env)
       free (filename);
       close (fd);
       return rc;
     }
 
   mu_stream_seek (env->compstr, 0, MU_SEEK_SET, NULL);
-  if (mailvar_is_true ("editheaders"))
+  if (mailvar_is_true (mailvar_name_editheaders))
     {
       dump_headers (tempstream, env);
 
       mu_stream_copy (tempstream, env->compstr, 0, NULL);
       
       do
@@ -404,13 +406,13 @@ quote0 (msgset_t *mspec, mu_message_t mesg, void *data)
   mu_stream_t flt;
   char *argv[3];
 
   mu_printf (_("Interpolating: %lu\n"),
 		    (unsigned long) mspec->msg_part[0]);
 
-  mailvar_get (&prefix, "indentprefix", mailvar_type_string, 0);
+  mailvar_get (&prefix, mailvar_name_indentprefix, mailvar_type_string, 0);
 
   argv[0] = "INLINE-COMMENT";
   argv[1] = prefix;
   argv[2] = NULL;
   rc = mu_filter_create_args (&flt, clos->str, "INLINE-COMMENT",
 			      2, (const char**) argv,
diff --git a/mail/file.c b/mail/file.c
index 98efaca92..d7bd41bf6 100644
--- a/mail/file.c
+++ b/mail/file.c
@@ -138,13 +138,13 @@ mail_file (int argc, char **argv)
       mu_url_destroy (&prev_url);
       prev_url = tmp_url;
 
       mbox = newbox;
       mu_mailbox_messages_count (mbox, &total);
       set_cursor (1);
-      if (mailvar_is_true ("header"))
+      if (mailvar_is_true (mailvar_name_header))
 	{
 	  util_do_command ("summary");
 	  util_do_command ("headers");
 	}
       return 0;
     }
diff --git a/mail/folders.c b/mail/folders.c
index 98ca45c26..271eb5676 100644
--- a/mail/folders.c
+++ b/mail/folders.c
@@ -22,13 +22,13 @@
 
 int
 mail_folders (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 {
   char *path;
 
-  if (mailvar_get (&path, "folder", mailvar_type_string, 1))
+  if (mailvar_get (&path, mailvar_name_folder, mailvar_type_string, 1))
     return 1;
 
   if (path[0] != '/' && path[0] != '~')
     {
       char *tmp = mu_alloc (strlen (path) + 3);
       tmp[0] = '~';
diff --git a/mail/from.c b/mail/from.c
index a9ee08f94..607d4f03f 100644
--- a/mail/from.c
+++ b/mail/from.c
@@ -190,13 +190,13 @@ hdr_date (struct header_call_args *args, void *data)
   mu_header_t hdr;
   char const *fmt = data ? data : "%a %b %e %H:%M";
   
   mu_message_get_header (args->msg, &hdr);
   
   date[0] = 0;
-  if (mailvar_is_true ("datefield")
+  if (mailvar_is_true (mailvar_name_datefield)
       && mu_header_get_value (hdr, MU_HEADER_DATE,
 			      date, sizeof (date), NULL) == 0)
     {
       time_t t;
       if (mu_parse_date (date, &t, NULL) == 0)
 	strftime (date, sizeof(date), fmt, localtime (&t));
@@ -221,13 +221,13 @@ hdr_date (struct header_call_args *args, void *data)
 
 char *
 sender_string (mu_message_t msg)
 {
   char *from = NULL;
   
-  if (mailvar_is_true ("fromfield"))
+  if (mailvar_is_true (mailvar_name_fromfield))
     {  
       mu_header_t hdr;
       
       if (mu_message_get_header (msg, &hdr) == 0
 	  && mu_header_aget_value_unfold (hdr, MU_HEADER_FROM, &from) == 0)
 	{
@@ -236,13 +236,14 @@ sender_string (mu_message_t msg)
 	    {
 	      char *name;
 	      const char *email;
 	  
 	      if (mu_address_sget_email (address, 1, &email) == 0 && email)
 		{
-		  if (mailvar_is_true ("showto") && mail_is_my_name (email))
+		  if (mailvar_is_true (mailvar_name_showto)
+		      && mail_is_my_name (email))
 		    {
 		      char *tmp;
 
 		      if (mu_header_aget_value_unfold (hdr, MU_HEADER_TO, 
 						       &tmp) == 0)
 			{
diff --git a/mail/if.c b/mail/if.c
index da6eff9b7..eaa7746c3 100644
--- a/mail/if.c
+++ b/mail/if.c
@@ -92,13 +92,13 @@ mail_if (int argc, char **argv)
   if (argv[1][1] != 0)
     {
       mu_error(_("Valid if arguments are: s | r | t"));
       return 1;
     }
 
-  if (mailvar_get (&mode, "mode", mailvar_type_string, 1))
+  if (mailvar_get (&mode, mailvar_name_mode, mailvar_type_string, 1))
     exit (EXIT_FAILURE);
 
   if (if_cond() == 0)
     /* Propagate negative condition */
     cond = 0;
   else
diff --git a/mail/mail.c b/mail/mail.c
index 6feb049c4..b4d8f1d30 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -316,13 +316,14 @@ mail_cmdline (void *closure, int cont MU_ARG_UNUSED)
 {
   char *prompt = (char*) closure;
   char *rc;
 
   while (1)
     {
-      if (mailvar_is_true ("autoinc") && !mu_mailbox_is_updated (mbox))
+      if (mailvar_is_true (mailvar_name_autoinc)
+	  && !mu_mailbox_is_updated (mbox))
 	{
 	  mu_mailbox_messages_count (mbox, &total);
 	  page_invalidate (0);
 	  mu_printf (_("New mail has arrived.\n"));
 	}
 
@@ -331,13 +332,13 @@ mail_cmdline (void *closure, int cont MU_ARG_UNUSED)
       if (ml_got_interrupt ())
 	{
 	  mu_error (_("Interrupt"));
 	  continue;
 	}
 
-      if (!rc && mailvar_is_true ("ignoreeof"))
+      if (!rc && mailvar_is_true (mailvar_name_ignoreeof))
 	{
 	  mu_error (_("Use \"quit\" to quit."));
 	  continue;
 	}
 
       break;
@@ -479,13 +480,13 @@ main (int argc, char **argv)
   if (p && p[strspn (p, "0123456789")] == 0)
     util_do_command ("set columns=%s", p);
   else
     util_do_command ("set columns=%d", util_getcols ());
 
   /* Set the default mailer to sendmail.  */
-  mailvar_set ("sendmail",
+  mailvar_set (mailvar_name_sendmail,
 	       mu_strdup ("sendmail:" PATH_SENDMAIL), mailvar_type_string,
 	       MOPTF_OVERWRITE);
 
   /* argument parsing */
   mu_cli (argc, argv, &cli, mail_capa, NULL, &argc, &argv);
 
@@ -534,13 +535,13 @@ main (int argc, char **argv)
     util_cache_command (&command_list, "setq mode=send");
   else if (user)
     mu_asprintf (&file, "%%%s", user);
 
 
   /* read system-wide mail.rc and user's .mailrc */
-  if (mailvar_is_true ("rc"))
+  if (mailvar_is_true (mailvar_name_rc))
     util_do_command ("source %s", SITE_MAIL_RC);
   if ((p = getenv ("MAILRC")) && *p)
     util_do_command ("source %s", getenv ("MAILRC"));
 
   util_run_cached_commands (&command_list);
 
@@ -563,13 +564,13 @@ main (int argc, char **argv)
       util_do_command ("set noasksub");
       util_do_command ("set noaskcc");
       util_do_command ("set noaskbcc");
     }
 
   /* how should we be running? */
-  if (mailvar_get (&mode, "mode", mailvar_type_string, 1))
+  if (mailvar_get (&mode, mailvar_name_mode, mailvar_type_string, 1))
     exit (EXIT_FAILURE);
 
   /* Interactive mode */
 
   ml_readline_init ();
   mail_set_my_name (user);
@@ -579,13 +580,13 @@ main (int argc, char **argv)
     {
       char *buf = NULL;
       int rc;
 
       mu_argcv_string (argc, argv, &buf);
       rc = util_do_command ("mail %s", buf);
-      return mailvar_is_true ("mailx") ? 0 : rc;
+      return mailvar_is_true (mailvar_name_mailx) ? 0 : rc;
     }
   /* Or acting as a normal reader */
   else
     {
       if ((rc = mu_mailbox_create_default (&mbox, file)) != 0)
 	{
@@ -649,38 +650,39 @@ main (int argc, char **argv)
 	    do_and_quit ("print *");
 	  else if (strcmp (mode, "headers") == 0)
 	    do_and_quit ("from *");
 	  else if (strcmp (mode, "read"))
 	    {
 	      mu_error (_("Unknown mode `%s'"), mode);
-	      util_do_command ("quit");
+	      util_do_command (mailvar_name_quit);
 	      return 1;
 	    }
 	}
 
       if (total == 0
-	  && (strcmp (mode, "read") || !mailvar_is_true ("emptystart")))
+	  && (strcmp (mode, "read")
+	      || !mailvar_is_true (mailvar_name_emptystart)))
 	{
 	  if (secondary_url)
 	    mail_summary (0, NULL);
 	  else
 	    mu_printf (_("No mail for %s\n"), user ? user : mail_whoami ());
 	  return 1;
 	}
 
       /* initial commands */
-      if (mailvar_is_true ("header"))
+      if (mailvar_is_true (mailvar_name_header))
 	{
 	  util_do_command ("summary");
 	  util_do_command ("headers");
 	}
 
-      mailvar_get (&prompt, "prompt", mailvar_type_string, 0);
+      mailvar_get (&prompt, mailvar_name_prompt, mailvar_type_string, 0);
       mail_mainloop (mail_cmdline, (void*) prompt, 1);
       mu_printf ("\n");
-      util_do_command ("quit");
+      util_do_command (mailvar_name_quit);
       return 0;
     }
   /* We should never reach this point */
   return 1;
 }
 
diff --git a/mail/mail.h b/mail/mail.h
index f878e299f..081cc371a 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -129,13 +129,13 @@ struct mail_escape_entry
 {
   const char *shortname;
   const char *longname;
   const char *synopsis;
   int (*escfunc) (int, char **, compose_env_t *);
 };
-
+
 enum mailvar_type
   {
     mailvar_type_whatever,
     mailvar_type_number,
     mailvar_type_string,
     mailvar_type_boolean
@@ -153,12 +153,87 @@ struct mailvar_variable
   char *name;
   enum mailvar_type type;
   int set;
   union mailvar_value value;
 };
 
+/* Internal variable names */
+#define mailvar_name_allnet                     "allnet"
+#define mailvar_name_append                     "append"
+#define mailvar_name_appenddeadletter           "appenddeadletter"
+#define mailvar_name_askbcc                     "askbcc"
+#define mailvar_name_askcc                      "askcc"
+#define mailvar_name_ask                        "ask"
+#define mailvar_name_asksub                     "asksub"
+#define mailvar_name_autoinc                    "autoinc"
+#define mailvar_name_autoprint                  "autoprint"
+#define mailvar_name_byname                     "byname"
+#define mailvar_name_bang                       "bang"
+#define mailvar_name_charset                    "charset"
+#define mailvar_name_cmd                        "cmd"
+#define mailvar_name_columns                    "columns"
+#define mailvar_name_crt                        "crt"
+#define mailvar_name_datefield                  "datefield"
+#define mailvar_name_debug                      "debug"
+#define mailvar_name_decode_fallback            "decode-fallback"
+#define mailvar_name_dot                        "dot"
+#define mailvar_name_editheaders                "editheaders"
+#define mailvar_name_emptystart                 "emptystart"
+#define mailvar_name_escape                     "escape"
+#define mailvar_name_flipr                      "flipr"
+#define mailvar_name_folder                     "folder"
+#define mailvar_name_fromfield                  "fromfield"
+#define mailvar_name_gnu_last_command           "gnu-last-command"
+#define mailvar_name_header                     "header"
+#define mailvar_name_headline                   "headline"
+#define mailvar_name_hold                       "hold"
+#define mailvar_name_ignore                     "ignore"
+#define mailvar_name_ignoreeof                  "ignoreeof"
+#define mailvar_name_indentprefix               "indentprefix"
+#define mailvar_name_inplacealiases             "inplacealiases"
+#define mailvar_name_keep                       "keep"
+#define mailvar_name_keepsave                   "keepsave"
+#define mailvar_name_mailx                      "mailx"
+#define mailvar_name_metamail                   "metamail"
+#define mailvar_name_metoo                      "metoo"
+#define mailvar_name_mimenoask                  "mimenoask"
+#define mailvar_name_mode                       "mode"
+#define mailvar_name_nullbody                   "nullbody"
+#define mailvar_name_nullbodymsg                "nullbodymsg"
+#define mailvar_name_outfolder                  "outfolder"
+#define mailvar_name_page                       "page"
+#define mailvar_name_prompt                     "prompt"
+#define mailvar_name_quit                       "quit"
+#define mailvar_name_rc                         "rc"
+#define mailvar_name_readonly                   "readonly"
+#define mailvar_name_record                     "record"
+#define mailvar_name_recursivealiases           "recursivealiases"
+#define mailvar_name_regex                      "regex"
+#define mailvar_name_replyprefix                "replyprefix"
+#define mailvar_name_replyregex                 "replyregex"
+#define mailvar_name_return_address             "return-address"
+#define mailvar_name_save                       "save"
+#define mailvar_name_screen                     "screen"
+#define mailvar_name_sendmail                   "sendmail"
+#define mailvar_name_sendwait                   "sendwait"
+#define mailvar_name_sign                       "sign"
+#define mailvar_name_Sign                       "Sign"
+#define mailvar_name_showenvelope               "showenvelope"
+#define mailvar_name_showto                     "showto"
+#define mailvar_name_toplines                   "toplines"
+#define mailvar_name_variable_pretty_print      "variable-pretty-print"
+#define mailvar_name_varpp                      "varpp"
+#define mailvar_name_variable_strict            "variable-strict"
+#define mailvar_name_varstrict                  "varstrict"
+#define mailvar_name_verbose                    "verbose"
+#define mailvar_name_xmailer                    "xmailer"
+#define mailvar_name_mime                       "mime"
+#define mailvar_name_onehop                     "onehop"
+#define mailvar_name_quiet                      "quiet"
+#define mailvar_name_PID                        "PID"  
+
 typedef struct message_set msgset_t;
 
 struct message_set
 {
   msgset_t *next;       /* Link to the next message set */
   unsigned int npart;   /* Number of parts in this set */
diff --git a/mail/mailline.c b/mail/mailline.c
index 610fee291..647cb1e17 100644
--- a/mail/mailline.c
+++ b/mail/mailline.c
@@ -30,13 +30,13 @@ static volatile int _interrupted;
 static RETSIGTYPE
 sig_handler (int signo)
 {
   switch (signo)
     {
     case SIGINT:
-      if (mailvar_is_true ("quit"))
+      if (mailvar_is_true (mailvar_name_quit))
 	exit (0);
       _interrupted++;
       break;
 #if defined (SIGWINCH)
     case SIGWINCH:
       util_do_command ("set screen=%d", util_getlines ());
diff --git a/mail/mailvar.c b/mail/mailvar.c
index f5f1b6dc2..e39ea721a 100644
--- a/mail/mailvar.c
+++ b/mail/mailvar.c
@@ -53,254 +53,257 @@ static int set_folder (enum mailvar_cmd cmd,
 static int set_headline (enum mailvar_cmd,
 			 struct mailvar_variable *);
 
 struct mailvar_symbol mailvar_tab[] =
   {
     /* FIXME: */
-    { { "allnet", }, MAILVAR_HIDDEN },
+    { { mailvar_name_allnet, }, MAILVAR_HIDDEN },
 
     /* For compatibility with other mailx implementations.
        Never used, always true. */
-    { { "append", },
+    { { mailvar_name_append, },
       MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_RDONLY,
       N_("messages saved in mbox are appended to the end rather than prepended") },
-    { { "appenddeadletter", },
+    { { mailvar_name_appenddeadletter, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("append the contents of canceled letter to dead.letter file") },
-    { { "askbcc", },
+    { { mailvar_name_askbcc, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("prompt user for bcc before composing the message") },
-    { { "askcc", },
+    { { mailvar_name_askcc, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("prompt user for cc before composing the message") },
-    { { "ask", },
+    { { mailvar_name_ask, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("prompt user for subject before composing the message") },
-    { { "asksub", }, MAILVAR_ALIAS, NULL },
-    { { "autoinc", },
+    { { mailvar_name_asksub, }, MAILVAR_ALIAS, NULL },
+    { { mailvar_name_autoinc, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("automatically incorporate newly arrived messages")},
-    { { "autoprint", },
+    { { mailvar_name_autoprint, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("delete command behaves like dp") },
-    { { "byname" },
+    { { mailvar_name_byname },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("record outgoing messages in a file named after the first recipient; "
 	 "overrides the `record' variable") },
-    { { "bang", },
+    { { mailvar_name_bang, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("replace every occurrence of ! in arguments to the shell command"
 	 " with the last executed command") },
-    { { "charset", },
+    { { mailvar_name_charset, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("output character set for decoded header fields") },
-    { { "cmd", },
+    { { mailvar_name_cmd, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("default shell command for pipe") },
-    { { "columns", },
+    { { mailvar_name_columns, },
       MAILVAR_TYPEMASK (mailvar_type_number),
       N_("number of columns on terminal screen") },
-    { { "crt", },
+    { { mailvar_name_crt, },
       MAILVAR_TYPEMASK (mailvar_type_number) |
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("if numeric, sets the minimum number of output lines needed "
 	 "to engage paging; if boolean, use the height of the terminal "
 	 "screen to compute the threshold") },
-    { { "datefield", },
+    { { mailvar_name_datefield, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("get date from the `Date:' header, instead of the envelope") },
-    { { "debug", },
+    { { mailvar_name_debug, },
       MAILVAR_TYPEMASK (mailvar_type_string) |
 	MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("set Mailutils debug level"),
       set_debug },
-    { { "decode-fallback", },
+    { { mailvar_name_decode_fallback, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("how to represent characters that cannot be rendered using the "
 	 "current character set"),
       set_decode_fallback },
-    { { "dot", },
+    { { mailvar_name_dot, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("input message is terminated with a dot alone on a line") },
-    { { "editheaders", },
+    { { mailvar_name_editheaders, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("allow editing message headers while composing") },
-    { { "emptystart", },
+    { { mailvar_name_emptystart, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("start interactive mode if the mailbox is empty") },
-    { { "escape", },
+    { { mailvar_name_escape, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("character denoting escapes") },
-    { { "flipr", },
+    { { mailvar_name_flipr, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("swap the meaning of reply and Reply commands") },
-    { { "folder", },
+    { { mailvar_name_folder, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("folder directory name"),
       set_folder },
-    { { "fromfield", },
+    { { mailvar_name_fromfield, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("get sender address from the `From:' header, instead of "
 	 "the envelope") },
-    { { "gnu-last-command", },
+    { { mailvar_name_gnu_last_command, },
       MAILVAR_TYPEMASK (mailvar_type_string) | MAILVAR_RDONLY,
       N_("last executed command line") },
-    { { "header", },
+    { { mailvar_name_header, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("run the `headers' command after entering interactive mode") },
-    { { "headline", },
+    { { mailvar_name_headline, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("format string to use for the header summary"),
       set_headline },
-    { { "hold", },
+    { { mailvar_name_hold, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("hold the read or saved messages in the system mailbox") },
-    { { "ignore", },
+    { { mailvar_name_ignore, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("ignore keyboard interrupts when composing messages") },
-    { { "ignoreeof", },
+    { { mailvar_name_ignoreeof, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("ignore EOF character") },
-    { { "indentprefix", },
+    { { mailvar_name_indentprefix, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("string used by the ~m escape for indenting quoted messages") },
-    { { "inplacealiases", },
+    { { mailvar_name_inplacealiases, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("expand aliases in the address header field "
 	 "before starting composing the message") },
     /* For compatibility with other mailx implementations.
        Never used, always true. */
-    { { "keep", },
+    { { mailvar_name_keep, },
       MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_RDONLY,
       N_("keep the empty user's system mailbox,"
 	 " instead of removing it") },
-    { { "keepsave", },
+    { { mailvar_name_keepsave, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("keep saved messages in system mailbox too") },
-    { { "mailx", },
+    { { mailvar_name_mailx, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("enable mailx compatibility mode") },
-    { { "metamail", },
+    { { mailvar_name_metamail, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("interpret the content of message parts; if set to a string "
 	 "specifies the name of the external metamail command") },
-    { { "metoo", },
+    { { mailvar_name_metoo, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("do not remove sender addresses from the recipient list") },
-    { { "mimenoask", },
+    { { mailvar_name_mimenoask, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("a comma-separated list of MIME types for which "
 	 "no confirmation is needed before running metamail interpreter") },
-    { { "mode", },
+    { { mailvar_name_mode, },
       MAILVAR_TYPEMASK (mailvar_type_string) | MAILVAR_RDONLY,
       N_("the name of current operation mode") },
-    { { "nullbody", },
+    { { mailvar_name_nullbody, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("accept messages with an empty body") },
-    { { "nullbodymsg", },
+    { { mailvar_name_nullbodymsg, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("display this text when sending a message with empty body") },
-    { { "outfolder", },
+    { { mailvar_name_outfolder, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("keep created files in this folder") },
-    { { "page", },
+    { { mailvar_name_page, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("pipe command terminates each message with a formfeed") },
-    { { "prompt", },
+    { { mailvar_name_prompt, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("command prompt sequence") },
-    { { "quit", },
+    { { mailvar_name_quit, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("keyboard interrupts terminate the program") },
-    { { "rc", },
+    { { mailvar_name_rc, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("read the system-wide configuration file upon startup") },
-    { { "readonly", },
+    { { mailvar_name_readonly, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("mailboxes are opened in readonly mode") },
-    { { "record", },
+    { { mailvar_name_record, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("save outgoing messages in this file") },
-    { { "recursivealiases", },
+    { { mailvar_name_recursivealiases, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("recursively expand aliases") },
-    { { "regex", },
+    { { mailvar_name_regex, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("use of regular expressions in search message specifications") },
-    { { "replyprefix", },
+    { { mailvar_name_replyprefix, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("prefix for the subject line of a reply message") },
-    { { "replyregex", },
+    { { mailvar_name_replyregex, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("regexp for recognizing subject lines of reply messages"),
       set_replyregex },
-    { { "return-address" },
+    { { mailvar_name_return_address },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("return address for outgoing messages") },
-    { { "save", },
+    { { mailvar_name_save, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("store aborted messages in the user's dead.file") },
-    { { "screen", },
+    { { mailvar_name_screen, },
       MAILVAR_TYPEMASK (mailvar_type_number),
       N_("number of lines on terminal screen"),
       set_screen },
-    { { "sendmail", },
+    { { mailvar_name_sendmail, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("URL of the mail transport agent") },
     /* FIXME: Not yet used. */
-    { { "sendwait", },
+    { { mailvar_name_sendwait, },
       MAILVAR_TYPEMASK (mailvar_type_boolean) | MAILVAR_HIDDEN, NULL },
-    { { "sign", },
+    { { mailvar_name_sign, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("signature for use with the ~a command") },
-    { { "Sign", },
+    { { mailvar_name_Sign, },
       MAILVAR_TYPEMASK (mailvar_type_string),
       N_("name of the signature file for use with the ~A command") },
-    { { "showenvelope", },
+    { { mailvar_name_showenvelope, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("`print' command includes the SMTP envelope in its output") },
-    { { "showto", },
+    { { mailvar_name_showto, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("if the message was sent by me, print its recipient address "
 	 "in the header summary") },
-    { { "toplines", },
+    { { mailvar_name_toplines, },
       MAILVAR_TYPEMASK (mailvar_type_number),
       N_("number of lines to be displayed by `top' or `Top'") },
-    { { "variable-pretty-print", },
+    { { mailvar_name_variable_pretty_print, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("print variables with short descriptions") },
-    { { "varpp", }, MAILVAR_ALIAS },
-    { { "variable-strict", },
+    { { mailvar_name_varpp, }, MAILVAR_ALIAS },
+    { { mailvar_name_variable_strict, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("perform strict checking when setting variables") },
-    { { "varstrict", }, MAILVAR_ALIAS },
-    { { "verbose", },
+    { { mailvar_name_varstrict, }, MAILVAR_ALIAS },
+    { { mailvar_name_verbose, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("verbosely trace the process of message delivery"),
       set_verbose },
-    { { "xmailer", },
+    { { mailvar_name_xmailer, },
       MAILVAR_TYPEMASK (mailvar_type_boolean),
       N_("add the `X-Mailer' header to the outgoing messages") },