#include <lib-lib/file.h>
#include "mutt.h"
+#include "mx.h"
+#include "buffy.h"
+#include "sort.h"
+#include "mutt_crypt.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "url.h"
-#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "xterm.h"
#else
"-USE_DOTLOCK "
#endif
-#ifdef DL_STANDALONE
- "+DL_STANDALONE "
-#else
- "-DL_STANDALONE "
-#endif
- "\n "
#ifdef USE_FCNTL
"+USE_FCNTL "
#else
break;
case 'F':
- str_replace (&Muttrc, optarg);
+ m_strreplace(&Muttrc, optarg);
break;
case 'f':
if (alias_queries) {
int rv = 0;
- ADDRESS *a;
+ address_t *a;
for (; alias_queries; alias_queries = alias_queries->next) {
if ((a = mutt_lookup_alias (alias_queries->data))) {
#endif
mutt_expand_path (folder, sizeof (folder));
- str_replace (&CurrentFolder, folder);
- str_replace (&LastFolder, folder);
+ m_strreplace(&CurrentFolder, folder);
+ m_strreplace(&LastFolder, folder);
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */