mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-17 08:01:36 +00:00
- Update to 1.5.13
PR: ports/102697 Submitted by: Udo Schweigert <udo.schweigert@siemens.com> (maintainer)
This commit is contained in:
Renato Botelho
parent
9ac5d9b326
commit
1783cd17e4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=171806
@ -106,7 +106,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= mutt-devel
|
||||
PORTVERSION= 1.5.12
|
||||
PORTVERSION= 1.5.13
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES+= mail ipv6
|
||||
.if defined(WITH_MUTT_NNTP)
|
||||
@ -329,11 +329,6 @@ post-patch::
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if defined(WITH_MUTT_SIDEBAR_PATCH)
|
||||
post-patch::
|
||||
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sidebar
|
||||
.endif
|
||||
|
||||
.if defined(WITH_MUTT_ASPELL)
|
||||
post-patch::
|
||||
@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell
|
||||
@ -419,7 +414,7 @@ pre-patch::
|
||||
PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
|
||||
.endif
|
||||
.if defined(WITH_MUTT_SIDEBAR_PATCH)
|
||||
SIDEBAR_PATCH= patch-1.5.12.sidebar.20060720.txt
|
||||
SIDEBAR_PATCH= patch-1.5.13.sidebar.20060828.txt
|
||||
DISTFILES+= ${SIDEBAR_PATCH}:tchan
|
||||
XML_NEEDED= yes
|
||||
pre-patch::
|
||||
@ -442,7 +437,7 @@ post-patch::
|
||||
@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
|
||||
${WRKSRC}/contrib/pgp6.rc
|
||||
@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
|
||||
${WRKSRC}/contrib/Makefile.in
|
||||
${WRKSRC}/contrib/Makefile.am
|
||||
|
||||
pre-configure::
|
||||
@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
MD5 (mutt/mutt-1.5.12.tar.gz) = 57196c816211a72900fdc54341eb0132
|
||||
SHA256 (mutt/mutt-1.5.12.tar.gz) = 0d0c2ab6cea0d93579bc5490fafdae3bf640070d993490c7b00ccac4fa808b67
|
||||
SIZE (mutt/mutt-1.5.12.tar.gz) = 3440835
|
||||
MD5 (mutt/patch-1.5.12.rr.compressed.gz) = 9a164da2a647de6a6e19c4d43bd032aa
|
||||
SHA256 (mutt/patch-1.5.12.rr.compressed.gz) = 8311bdb651a39e492ac66591324c0c21a3d7c7c7c487a86676db01fd62f12606
|
||||
SIZE (mutt/patch-1.5.12.rr.compressed.gz) = 10066
|
||||
MD5 (mutt/patch-1.5.12.vvv.nntp.gz) = 7cbc1e12a743b3ad9a594a5da29f6d35
|
||||
SHA256 (mutt/patch-1.5.12.vvv.nntp.gz) = 5d921156e0b3e6ccb53964c8308a0c3f2b57357512b453a8bdfa49e7978c0f05
|
||||
SIZE (mutt/patch-1.5.12.vvv.nntp.gz) = 54910
|
||||
MD5 (mutt/mutt-1.5.13.tar.gz) = 456a138680a6726f14983cb3e9ff4e22
|
||||
SHA256 (mutt/mutt-1.5.13.tar.gz) = e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9
|
||||
SIZE (mutt/mutt-1.5.13.tar.gz) = 3442681
|
||||
MD5 (mutt/patch-1.5.13.rr.compressed.gz) = 2f1d2b9defc3ad81ab3893aefdaa8fe4
|
||||
SHA256 (mutt/patch-1.5.13.rr.compressed.gz) = 236ea2ed2c5b0195d1f72647d17de5c4cbe7faf78de4cdeb983ab6799baf2f7d
|
||||
SIZE (mutt/patch-1.5.13.rr.compressed.gz) = 10058
|
||||
MD5 (mutt/patch-1.5.13.vvv.nntp.gz) = 68af2e3641d2e46546ad29d66781a700
|
||||
SHA256 (mutt/patch-1.5.13.vvv.nntp.gz) = bfd8431c35dfd47fe8de502ae93cb9969c18ea464ed1fe832c6443f9e12a5577
|
||||
SIZE (mutt/patch-1.5.13.vvv.nntp.gz) = 54834
|
||||
MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
|
||||
SHA256 (mutt/patch-1.5.4.cd.ifdef.1) = 7d11892bcc688bbc82b5996ca0fda2d4446d8e928bec50b2731f8a3a5d9be373
|
||||
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
|
||||
MD5 (mutt/patch-1.5.12.vvv.initials.gz) = 1cc3b352f92c14f619c534aaa8e4900d
|
||||
SHA256 (mutt/patch-1.5.12.vvv.initials.gz) = 4b4e8953c0d8144366ae8ca1a616253218981dbca4bf312c87766fa9c408833f
|
||||
SIZE (mutt/patch-1.5.12.vvv.initials.gz) = 683
|
||||
MD5 (mutt/patch-1.5.12.vvv.quote.gz) = 48df3c09a4a467ce0347588ecff1d73b
|
||||
SHA256 (mutt/patch-1.5.12.vvv.quote.gz) = 5110a3437311e07216b102c17f3888b4fff2f593f1107fd46247559028b9d6d2
|
||||
SIZE (mutt/patch-1.5.12.vvv.quote.gz) = 1967
|
||||
MD5 (mutt/patch-1.5.13.vvv.initials.gz) = 52df400d31e225c02bea2f575db03b2a
|
||||
SHA256 (mutt/patch-1.5.13.vvv.initials.gz) = b6e1dc90fc871ea6227da33f7c69d12175836eac0d98154096f51dfee5568914
|
||||
SIZE (mutt/patch-1.5.13.vvv.initials.gz) = 682
|
||||
MD5 (mutt/patch-1.5.13.vvv.quote.gz) = 3afa1bb8065ff207420ba9bc4fe2ae8c
|
||||
SHA256 (mutt/patch-1.5.13.vvv.quote.gz) = 77f3d497796a1112f1908ac9bdc12babaa6146824e878f8cb284accda0499de7
|
||||
SIZE (mutt/patch-1.5.13.vvv.quote.gz) = 1965
|
||||
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
|
||||
SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
|
||||
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
|
||||
MD5 (mutt/patch-1.5.12.sidebar.20060720.txt) = aec38e08ace75aa8a36cb5f6ae318b4b
|
||||
SHA256 (mutt/patch-1.5.12.sidebar.20060720.txt) = 5373460e9846cf86d6da2192de37cc6ac98f37dc15e7820b6681ae86b9bed9d5
|
||||
SIZE (mutt/patch-1.5.12.sidebar.20060720.txt) = 47695
|
||||
MD5 (mutt/patch-1.5.13.sidebar.20060828.txt) = b1e18dcdfdb33cfcf8965f332b9f3f9f
|
||||
SHA256 (mutt/patch-1.5.13.sidebar.20060828.txt) = bafb6fed5057d1b78544a06c192bc67fca259c5cccd15312b292824849e3aa20
|
||||
SIZE (mutt/patch-1.5.13.sidebar.20060828.txt) = 49483
|
||||
MD5 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 45cacc5155f1865ace31c72e2bffee63
|
||||
SHA256 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 41ae6d049d2d39c3bb01d534a760372ec571bc51e90c259f529c477aa41d3d7e
|
||||
SIZE (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 2555
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- Makefile.am.orig Fri Feb 4 18:12:14 2005
|
||||
+++ Makefile.am Fri Feb 4 18:17:17 2005
|
||||
@@ -195,6 +195,7 @@
|
||||
$(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc
|
||||
touch stamp-doc-rc
|
||||
|
||||
+mutt_SOURCES += sidebar.c
|
||||
|
||||
.PHONY: commit pclean check-security commit-real commit-changelog
|
||||
.PHONY: changelog ChangeLog
|
||||
@ -1,3 +1,24 @@
|
||||
--- doc/Makefile.am.orig Mon Aug 14 16:06:21 2006
|
||||
+++ doc/Makefile.am Wed Aug 30 14:52:04 2006
|
||||
@@ -63,9 +63,6 @@
|
||||
$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
|
||||
done
|
||||
-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
|
||||
- -for f in $(HTML_DOCFILES) ; do \
|
||||
- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
|
||||
- done
|
||||
|
||||
uninstall-local:
|
||||
for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
|
||||
@@ -82,7 +79,7 @@
|
||||
|
||||
check:
|
||||
manual.txt: manual.html
|
||||
- -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
|
||||
+ -lynx -dump -nolist -with_backspaces manual.html > $@ || w3m -dump $^ > $@
|
||||
|
||||
manual.html: $(srcdir)/html.xsl stamp-doc-xml
|
||||
-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
|
||||
--- doc/Makefile.in.orig1 Wed Jul 5 10:40:07 2006
|
||||
+++ doc/Makefile.in Mon Jul 17 15:49:28 2006
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
19
mail/mutt-devel/files/patch-Makefile.am
Normal file
19
mail/mutt-devel/files/patch-Makefile.am
Normal file
@ -0,0 +1,19 @@
|
||||
--- Makefile.am.orig2 Fri Sep 1 14:27:36 2006
|
||||
+++ Makefile.am Fri Sep 1 14:28:47 2006
|
||||
@@ -145,16 +145,12 @@
|
||||
install-data-local: Muttrc
|
||||
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
|
||||
$(INSTALL) -m644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
|
||||
- $(INSTALL) -m644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
|
||||
-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
|
||||
mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
|
||||
elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
|
||||
mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
|
||||
elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
|
||||
$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
|
||||
- fi
|
||||
- -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
|
||||
- $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
|
||||
fi
|
||||
|
||||
uninstall-local:
|
||||
@ -1,6 +1,6 @@
|
||||
--- contrib/Makefile.in.orig Wed Apr 2 10:57:06 2003
|
||||
+++ contrib/Makefile.in Mon Mar 21 08:22:47 2005
|
||||
@@ -20,7 +20,7 @@
|
||||
--- contrib/Makefile.am.orig Tue Jul 18 20:04:14 2006
|
||||
+++ contrib/Makefile.am Wed Aug 30 16:15:04 2006
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
subdir = contrib
|
||||
|
||||
@ -1,29 +1,29 @@
|
||||
--- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001
|
||||
+++ contrib/Makefile.in Wed Mar 26 11:45:15 2003
|
||||
@@ -12,6 +12,7 @@
|
||||
mandir = @mandir@
|
||||
srcdir = @srcdir@
|
||||
docdir = @docdir@
|
||||
+samplesdir = @samplesdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = ..
|
||||
INSTALL = @INSTALL@
|
||||
@@ -37,12 +38,12 @@
|
||||
check:
|
||||
--- contrib/Makefile.am.orig Tue Jul 18 20:04:14 2006
|
||||
+++ contrib/Makefile.am Wed Aug 30 16:05:33 2006
|
||||
@@ -1,6 +1,7 @@
|
||||
# $Id: Makefile.am,v 3.1 2006/07/18 18:04:14 brendan Exp $
|
||||
|
||||
install:
|
||||
subdir = contrib
|
||||
+samplesdir = @samplesdir@
|
||||
|
||||
SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
|
||||
sample.muttrc sample.mailcap sample.muttrc-tlr \
|
||||
@@ -14,12 +15,12 @@
|
||||
iconv/make.sh
|
||||
|
||||
install-data-local:
|
||||
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
|
||||
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
|
||||
for f in $(SAMPLES) ; do \
|
||||
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \
|
||||
+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir); \
|
||||
+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir) ; \
|
||||
done
|
||||
for f in $(srcdir)/iconv/*.rc ; do \
|
||||
- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \
|
||||
+ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \
|
||||
+ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \
|
||||
done
|
||||
|
||||
# Nothing needs to be done - uninstall in doc removes samples as well.
|
||||
uninstall-local:
|
||||
--- init.h.orig Tue Mar 4 10:28:12 2003
|
||||
+++ init.h Wed Mar 26 15:41:19 2003
|
||||
@@ -1455,8 +1455,8 @@
|
||||
@ -48,14 +48,14 @@
|
||||
** (S/MIME only)
|
||||
*/
|
||||
{ "smime_verify_command", DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
|
||||
--- Makefile.am.orig Mon Jul 17 15:31:10 2006
|
||||
+++ Makefile.am Mon Jul 17 15:32:52 2006
|
||||
--- Makefile.am.orig Wed Aug 30 14:30:28 2006
|
||||
+++ Makefile.am Wed Aug 30 14:31:49 2006
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
|
||||
|
||||
-BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h
|
||||
+BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h Muttrc
|
||||
-BUILT_SOURCES = keymap_defs.h patchlist.c
|
||||
+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
|
||||
|
||||
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
|
||||
mutt_SOURCES = $(BUILT_SOURCES) \
|
||||
@ -77,27 +77,27 @@
|
||||
|
||||
into your system's global Muttrc, which normally resides in /etc or
|
||||
/usr/local/etc.
|
||||
--- doc/manual.txt.orig Thu Sep 15 16:22:18 2005
|
||||
+++ doc/manual.txt Sun Sep 18 15:31:13 2005
|
||||
@@ -5004,8 +5004,8 @@
|
||||
--- doc/manual.txt.orig Mon Aug 14 16:10:04 2006
|
||||
+++ doc/manual.txt Wed Aug 30 14:34:46 2006
|
||||
@@ -5971,8 +5971,8 @@
|
||||
|
||||
For examples on how to configure these formats for the various
|
||||
versions of PGP which are floating around, see the pgp*.rc and gpg.rc
|
||||
- files in the samples/ subdirectory which has been installed on your
|
||||
- system alongside the documentation. (PGP only)
|
||||
+ files in the share/examples/mutt/ subdirectory which has been installed
|
||||
+ on your system alongside the documentation. (PGP only)
|
||||
For examples on how to configure these formats for the various versions of
|
||||
PGP which are floating around, see the pgp*.rc and gpg.rc files in the
|
||||
- samples/ subdirectory which has been installed on your system alongside the
|
||||
- documentation. (PGP only)
|
||||
+ share/examples/mutt/ subdirectory which has been installed on your system
|
||||
+ alongside the documentation. (PGP only)
|
||||
|
||||
6.3.160. pgp_getkeys_command
|
||||
3.163. pgp_getkeys_command
|
||||
|
||||
@@ -5203,8 +5203,8 @@
|
||||
$$ssmmiimmee__ccaa__llooccaattiioonn" or "-CAfile $$ssmmiimmee__ccaa__llooccaattiioonn".
|
||||
@@ -6164,8 +6164,8 @@
|
||||
"-CAfile $smime_ca_location".
|
||||
|
||||
For examples on how to configure these formats, see the smime.rc in
|
||||
- the samples/ subdirectory which has been installed on your system
|
||||
- alongside the documentation. (S/MIME only)
|
||||
+ the share/examples/mutt/ subdirectory which has been installed on
|
||||
+ your system alongside the documentation. (S/MIME only)
|
||||
For examples on how to configure these formats, see the smime.rc in the
|
||||
- samples/ subdirectory which has been installed on your system alongside the
|
||||
- documentation. (S/MIME only)
|
||||
+ share/examples/mutt/ subdirectory which has been installed on your system
|
||||
+ alongside the documentation. (S/MIME only)
|
||||
|
||||
6.3.179. smime_verify_command
|
||||
3.182. smime_verify_command
|
||||
|
||||
|
||||
@ -1,110 +1,3 @@
|
||||
diff -Nru a/PATCHES b/PATCHES
|
||||
--- PATCHES
|
||||
+++ PATCHES
|
||||
@@ -0,0 +1 @@
|
||||
+patch-1.5.6+20040904.tg.mutt-thread.3
|
||||
diff -Nru a/mutt.h b/mutt.h
|
||||
--- mutt.h 2004-07-24 12:27:21 +02:00
|
||||
+++ mutt.h 2004-09-04 12:36:18 +02:00
|
||||
@@ -211,6 +211,7 @@
|
||||
/* actions for mutt_pattern_comp/mutt_pattern_exec */
|
||||
M_AND,
|
||||
M_OR,
|
||||
+ M_THREAD,
|
||||
M_TO,
|
||||
M_CC,
|
||||
M_COLLAPSED,
|
||||
diff -Nru a/pattern.c b/pattern.c
|
||||
--- pattern.c 2004-07-24 12:27:23 +02:00
|
||||
+++ pattern.c 2004-09-04 12:37:52 +02:00
|
||||
@@ -700,7 +700,7 @@
|
||||
pattern_t *mutt_pattern_comp (/* const */ char *s, int flags, BUFFER *err)
|
||||
{
|
||||
pattern_t *curlist = NULL;
|
||||
- pattern_t *tmp;
|
||||
+ pattern_t *tmp, *tmp2;
|
||||
pattern_t *last = NULL;
|
||||
int not = 0;
|
||||
int alladdr = 0;
|
||||
@@ -755,6 +755,39 @@
|
||||
alladdr = 0;
|
||||
break;
|
||||
case '~':
|
||||
+ if (*(ps.dptr + 1) == '(') {
|
||||
+ ps.dptr ++; /* skip ~ */
|
||||
+ p = find_matching_paren (ps.dptr + 1);
|
||||
+ if (*p != ')')
|
||||
+ {
|
||||
+ snprintf (err->data, err->dsize, _("mismatched brackets: %s"), ps.dptr);
|
||||
+ mutt_pattern_free (&curlist);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ tmp = new_pattern ();
|
||||
+ tmp->op = M_THREAD;
|
||||
+ if (last)
|
||||
+ last->next = tmp;
|
||||
+ else
|
||||
+ curlist = tmp;
|
||||
+ last = tmp;
|
||||
+ tmp->not ^= not;
|
||||
+ tmp->alladdr |= alladdr;
|
||||
+ not = 0;
|
||||
+ alladdr = 0;
|
||||
+ /* compile the sub-expression */
|
||||
+ buf = mutt_substrdup (ps.dptr + 1, p);
|
||||
+ if ((tmp2 = mutt_pattern_comp (buf, flags, err)) == NULL)
|
||||
+ {
|
||||
+ FREE (&buf);
|
||||
+ mutt_pattern_free (&curlist);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ FREE (&buf);
|
||||
+ tmp->child = tmp2;
|
||||
+ ps.dptr = p + 1; /* restore location */
|
||||
+ break;
|
||||
+ }
|
||||
if (implicit && or)
|
||||
{
|
||||
/* A | B & C == (A | B) & C */
|
||||
@@ -945,6 +978,29 @@
|
||||
return alladdr;
|
||||
}
|
||||
|
||||
+static int match_threadcomplete(struct pattern_t *pat, pattern_exec_flag flags, CONTEXT *ctx, THREAD *t,int left,int up,int right,int down)
|
||||
+{
|
||||
+ int a;
|
||||
+ HEADER *h;
|
||||
+
|
||||
+ if(!t)
|
||||
+ return 0;
|
||||
+ h = t->message;
|
||||
+ if(h)
|
||||
+ if(mutt_pattern_exec(pat, flags, ctx, h))
|
||||
+ return 1;
|
||||
+
|
||||
+ if(up && (a=match_threadcomplete(pat, flags, ctx, t->parent,1,1,1,0)))
|
||||
+ return a;
|
||||
+ if(right && t->parent && (a=match_threadcomplete(pat, flags, ctx, t->next,0,0,1,1)))
|
||||
+ return a;
|
||||
+ if(left && t->parent && (a=match_threadcomplete(pat, flags, ctx, t->prev,1,0,0,1)))
|
||||
+ return a;
|
||||
+ if(down && (a=match_threadcomplete(pat, flags, ctx, t->child,1,0,1,1)))
|
||||
+ return a;
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
/* flags
|
||||
M_MATCH_FULL_ADDRESS match both personal and machine address */
|
||||
int
|
||||
@@ -958,6 +1014,8 @@
|
||||
return (pat->not ^ (perform_and (pat->child, flags, ctx, h) > 0));
|
||||
case M_OR:
|
||||
return (pat->not ^ (perform_or (pat->child, flags, ctx, h) > 0));
|
||||
+ case M_THREAD:
|
||||
+ return (pat->not ^ match_threadcomplete(pat->child, flags, ctx, h->thread, 1, 1, 1, 1));
|
||||
case M_ALL:
|
||||
return (!pat->not);
|
||||
case M_EXPIRED:
|
||||
--- mutt.h.orig2 Mon Sep 6 09:24:17 2004
|
||||
+++ mutt.h Mon Sep 6 09:27:04 2004
|
||||
@@ -212,6 +212,7 @@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user