X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.cpkg;h=a3b8d8d072787597b6d4057dac56f097d08b67c3;hp=7342c31cbf7cd1a9e56cc8878b6fa8351911bf49;hb=981e10e224fde4de5d40adcee1deda89df2715ca;hpb=9946738a6a1c27a5602a14d1afe2eea2389732b2

diff --git a/alias.cpkg b/alias.cpkg
index 7342c31..a3b8d8d 100644
--- a/alias.cpkg
+++ b/alias.cpkg
@@ -29,8 +29,7 @@
 
 #include <lib-sys/unix.h>
 
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
 
 #include "alias.h"
@@ -144,15 +143,6 @@ alias_t *Aliases;
 
 #define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
 
-static struct mapping_t AliasHelp[] = {
-    {N_("Exit"), OP_EXIT},
-    {N_("Del"), OP_DELETE},
-    {N_("Undel"), OP_UNDELETE},
-    {N_("Select"), OP_GENERIC_SELECT_ENTRY},
-    {N_("Help"), OP_HELP},
-    {NULL, OP_NULL}
-};
-
 static void mutt_alias_menu(char *, size_t, alias_t *);
 
 const address_t *alias_lookup(const char *s)
@@ -616,9 +606,8 @@ alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
 
 static void alias_entry(char *s, ssize_t slen, MUTTMENU *m, int num)
 {
-    m_strformat(s, slen, COLS - SW, MAlias.alias_format, alias_format_str,
-                ((alias_t **)m->data)[num],
-                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    m_strformat(s, slen, getmaxx(main_w), MAlias.alias_format, alias_format_str,
+                ((alias_t **)m->data)[num], 0);
 }
 
 static int alias_tag (MUTTMENU * menu, int n, int m)
@@ -673,7 +662,6 @@ void mutt_alias_menu (char *buf, size_t buflen, alias_t * aliases)
   int t = -1;
   int i, done = 0;
   int op;
-  char helpstr[STRING];
 
   int omax;
 
@@ -691,8 +679,6 @@ void mutt_alias_menu (char *buf, size_t buflen, alias_t * aliases)
   menu->tag = alias_tag;
   menu->menu = MENU_ALIAS;
   menu->title = _("Aliases");
-  menu->help = mutt_compile_help(helpstr, sizeof(helpstr),
-                                 MENU_ALIAS, AliasHelp);
 
 new_aliases: