-#define NONULL(x) x?x:""
-
-# define HUGE_STRING 5120
-# define LONG_STRING 1024
-# define STRING 256
-# define SHORT_STRING 128
-
-/*
- * Create a format string to be used with scanf.
- * To use it, write, for instance, MUTT_FORMAT(HUGE_STRING).
- *
- * See K&R 2nd ed, p. 231 for an explanation.
- */
-# define _MUTT_FORMAT_2(a,b) "%" a b
-# define _MUTT_FORMAT_1(a, b) _MUTT_FORMAT_2(#a, b)
-# define MUTT_FORMAT(a) _MUTT_FORMAT_1(a, "s")
-# define MUTT_FORMAT2(a,b) _MUTT_FORMAT_1(a, b)
-
-# define ISSPACE(c) isspace((unsigned char)c)
-# define strfcpy(A,B,C) strncpy(A,B,C), *(A+(C)-1)=0
-
-/* this macro must check for *c == 0 since isspace(0) has unreliable behavior
- on some systems */
-# define SKIPWS(c) while (*(c) && isspace ((unsigned char) *(c))) c++;
-
-#define ISBLANK(c) (c == ' ' || c == '\t')