X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=alias.c;h=f092a8caa04eea7cce8693324982b89d30c0906b;hb=f335a8c113b45a45d2546630fd62ee950641a45e;hp=877add8afba31dcbcc946313893c5ef54927efc9;hpb=74a2265af51ce89bca845adc1d68f273c9933c13;p=apps%2Fmadmutt.git diff --git a/alias.c b/alias.c index 877add8..f092a8c 100644 --- a/alias.c +++ b/alias.c @@ -12,13 +12,13 @@ #endif #include "mutt.h" -#include "mutt_regex.h" #include "mutt_curses.h" #include "mutt_idna.h" #include "lib/mem.h" #include "lib/intl.h" #include "lib/str.h" +#include "lib/rx.h" #include #include @@ -527,11 +527,11 @@ int mutt_addr_is_user (ADDRESS * addr) return 1; } - if (mutt_match_rx_list (addr->mailbox, Alternates)) { + if (rx_list_match (Alternates, addr->mailbox)) { dprint (5, (debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n", addr->mailbox)); - if (mutt_match_rx_list (addr->mailbox, UnAlternates)) + if (rx_list_match (UnAlternates, addr->mailbox)) dprint (5, (debugfile, "mail_addr_is_user: but, %s matched by unalternates.\n",