Update and enable NNTP patch

[software/mutt-debian.git] / addrbook.c

diff --git a/addrbook.c b/addrbook.c
index a719062a04f2aa6a45de33a39c495aab68970d4a..7d82cf5782836d168527fc95fdc0ee1169dac7ab 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
+ * Copyright (C) 1996-2000,2007 Michael R. Elkins <me@mutt.org>

  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by


@@ -39,7 +39,7 @@ static struct mapping_t AliasHelp[] = {
   { N_("Undel"),  OP_UNDELETE },
   { N_("Select"), OP_GENERIC_SELECT_ENTRY },
   { N_("Help"),   OP_HELP },
   { N_("Undel"),  OP_UNDELETE },
   { N_("Select"), OP_GENERIC_SELECT_ENTRY },
   { N_("Help"),   OP_HELP },

-  { NULL }
+  { NULL,        0 }

 };
 
 static const char *
 };
 
 static const char *


@@ -149,10 +149,9 @@ void mutt_alias_menu (char *buf, size_t buflen, ALIAS *aliases)
   /* tell whoever called me to redraw the screen when I return */
   set_option (OPTNEEDREDRAW);
   
   /* tell whoever called me to redraw the screen when I return */
   set_option (OPTNEEDREDRAW);
   

-  menu = mutt_new_menu ();
+  menu = mutt_new_menu (MENU_ALIAS);

   menu->make_entry = alias_entry;
   menu->tag = alias_tag;
   menu->make_entry = alias_entry;
   menu->tag = alias_tag;

-  menu->menu = MENU_ALIAS;

   menu->title = _("Aliases");
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_ALIAS, AliasHelp);
 
   menu->title = _("Aliases");
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_ALIAS, AliasHelp);