#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
+#include <lib-lib/debug.h>
+#include <lib-lib/rx.h>
#include <lib-ui/curses.h>
-
-#include "lib/rx.h"
-#include "lib/debug.h"
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
#include "mutt.h"
-#include "enter.h"
#include "mutt_idna.h"
-#include "mutt_menu.h"
#include "sort.h"
#define RSORT(x) (SortAlias & SORT_REVERSE) ? -x : x
#define min(a,b) ((a<b)?a:b)
if (s[0] != 0) { /* avoid empty string as strstr argument */
- p_clear(bestname, sizeof(bestname));
+ p_clear(bestname, countof(bestname));
while (a) {
if (a->name && strstr (a->name, s) == a->name) {