improvements, fixes, parser progress, ...

[apps/madmutt.git] / keymap.c

diff --git a/keymap.c b/keymap.c
index 5c9b9a6..17ee21f 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -740,12 +740,11 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
 {
   struct binding_t *bindings = NULL;
   char *key;
-  int menu[sizeof (Menus) / sizeof (struct mapping_t) - 1], r =
+  int menu[countof(Menus) - 1], r =
     0, nummenus, i;
 
-  if ((key = parse_keymap (menu, s, sizeof (menu) / sizeof (menu[0]),
-                           &nummenus, err)) == NULL)
-    return (-1);
+  if (!(key = parse_keymap(menu, s, countof(menu), &nummenus, err)))
+    return -1;
 
   /* function to execute */
   mutt_extract_token (buf, s, 0);