remove cruft (Synonyms)

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/init.c b/init.c
index e36ac61..a04efbd 100644 (file)
--- a/init.c
+++ b/init.c
@@ -393,9 +393,6 @@ static struct {
   { DT_SORT,    sort_to_string,   sort_from_string },
   { DT_RX,      rx_to_string,     rx_from_string },
   { DT_MAGIC,   magic_to_string,  magic_from_string },
-  /* synonyms should be resolved already so we don't need this
-   * but must define it as DT_ is used for indexing */
-  { DT_SYN,     NULL,             NULL },
   { DT_ADDR,    addr_to_string,   addr_from_string },
 };
 
@@ -907,11 +904,6 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p,
     char buf[LONG_STRING];
     struct option_t *ptr = p;
 
-    if (DTYPE(ptr->type) == DT_SYN) {
-        if (!more)
-            return;
-        ptr = hash_find(ConfigOptions, (const char *)ptr->data);
-    }
     if (!ptr || *ptr->init || !FuncTable[DTYPE (ptr->type)].opt_fromstr)
         return;
 
@@ -926,8 +918,7 @@ static int init_expand (char** dst, struct option_t* src) {
 
   p_delete(dst);
 
-  if (DTYPE(src->type) == DT_STR ||
-      DTYPE(src->type) == DT_PATH) {
+  if (DTYPE(src->type) == DT_STR || DTYPE(src->type) == DT_PATH) {
     /* only expand for string as it's the only place where
      * we want to expand vars right now */
     if (src->init && *src->init) {
@@ -960,11 +951,6 @@ static void mutt_restore_default (const char* name __attribute__ ((unused)),
   struct option_t* ptr = (struct option_t*) p;
   char* init = NULL;
 
-  if (DTYPE (ptr->type) == DT_SYN) {
-    if (!more)
-      return;
-    ptr = hash_find (ConfigOptions, (char*) ptr->data);
-  }
   if (!ptr)
     return;
   if (FuncTable[DTYPE (ptr->type)].opt_fromstr) {
@@ -1090,21 +1076,7 @@ static int parse_set (BUFFER * tmp, BUFFER * s, unsigned long data,
 
     /* get the variable name */
     mutt_extract_token (tmp, s, M_TOKEN_EQUAL);
-
-    /* resolve synonyms */
-    if ((option = hash_find (ConfigOptions, tmp->data)) != NULL &&
-        DTYPE (option->type == DT_SYN))
-    {
-      struct option_t* newopt = hash_find (ConfigOptions, (char*) option->data);
-      syn_t* syn = syn_new();
-      syn->f = m_strdup(CurRCFile);
-      syn->l = CurRCLine;
-      syn->n = newopt;
-      syn->o = option;
-      syn_list_push(&Synonyms, syn);
-      option = newopt;
-    }
-
+    option = hash_find(ConfigOptions, tmp->data);
     if (!option && !(reset && m_strcmp("all", tmp->data) == 0)) {
       snprintf (err->data, err->dsize, _("%s: unknown variable"), tmp->data);
       return (-1);
@@ -1950,9 +1922,6 @@ int mutt_dump_variables (int full) {
         struct option_t *option = MuttVars + i;
         char buf[LONG_STRING];
 
-        if (DTYPE(option->type) == DT_SYN)
-            continue;
-
         if (!full) {
             mutt_option_value(option->option, buf, sizeof(buf));
             if (!m_strcmp(buf, option->init))

diff --git a/init.h b/init.h
index d25f618..9617d21 100644 (file)
--- a/init.h
+++ b/init.h
@@ -29,8 +29,7 @@
 #define DT_SORT         6       /* sorting methods */
 #define DT_RX           7       /* regular expressions */
 #define DT_MAGIC        8       /* mailbox type */
-#define DT_SYN          9       /* synonym for another variable */
-#define DT_ADDR         10      /* e-mail address */
+#define DT_ADDR         9       /* e-mail address */
 
 #define DTYPE(x) ((x) & DT_MASK)
 
@@ -2351,7 +2350,6 @@ struct option_t MuttVars[] = {
    ** methods are unavailable. If a method is available but authentication
    ** fails, Madmutt will not connect to the POP server.
    */
-  {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0},
   {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" },
   /*
    ** .pp
@@ -3163,7 +3161,6 @@ struct option_t MuttVars[] = {
    ** Normally, the default should work.
    */
 #endif /* HAVE_GETADDRINFO */
-  {"user_agent", DT_SYN, R_NONE, UL "agent_string", 0 },
   {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" },
   /*
    ** .pp