This patch introduces the ~k pattern for messages containing pgp key

material.

diff --git a/doc/manual.sgml.in b/doc/manual.sgml.in
index 37d6cb826e7c3328c04ab09f8b44666022963193..e87c3c206156538a93fd9b99885f7b53ac9a2398 100644 (file)
--- a/doc/manual.sgml.in
+++ b/doc/manual.sgml.in
@@ -1402,6 +1402,7 @@ messages:
 ~g              PGP signed messages
 ~G              PGP encrypted messages
 ~h EXPR         messages which contain EXPR in the message header
+~k             message contains PGP key material
 ~i ID           message which match ID in the ``Message-ID'' field
 ~L EXPR         message is either originated or received by EXPR
 ~l              message is addressed to a known mailing list

diff --git a/mutt.h b/mutt.h
index 38208787c025be6b57e21657a1308e1d5cf896fb..2f8415b182bc30a1eaf1b4a265ed107da9e017c0 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -208,6 +208,7 @@ enum
 #ifdef _PGPPATH
   M_PGP_SIGN,
   M_PGP_ENCRYPT,
+  M_PGP_KEY,
 #endif
   
   /* Options for Mailcap lookup */

diff --git a/pattern.c b/pattern.c
index c8555a649cf703c29ae3693d87e4e83319dc18e4..9b83b732f309318b045f0cd956392b37077d9171 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -62,11 +62,14 @@ Flags[] =
   { 'f', M_FROM,               0,              eat_regexp },
   { 'F', M_FLAG,               0,              NULL },
 #ifdef _PGPPATH
-  { 'g', M_PGP_SIGN, 0, NULL },
-  { 'G', M_PGP_ENCRYPT, 0, NULL },
+  { 'g', M_PGP_SIGN,           0,              NULL },
+  { 'G', M_PGP_ENCRYPT,        0,              NULL },
 #endif
   { 'h', M_HEADER,             M_FULL_MSG,     eat_regexp },
   { 'i', M_ID,                 0,              eat_regexp },
+#ifdef _PGPPATH
+  { 'k', M_PGP_KEY,            0,              NULL },
+#endif
   { 'L', M_ADDRESS,            0,              eat_regexp },
   { 'l', M_LIST,               0,              NULL },
   { 'm', M_MESSAGE,            0,              eat_range },
@@ -826,23 +829,20 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags, CONTEXT *ctx,
     case M_RECIPIENT:
       return (pat->not ^ (match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS, h->env->to,pat->alladdr) ||
                          match_adrlist (pat->rx, flags & M_MATCH_FULL_ADDRESS, h->env->cc,pat->alladdr)));
-      break;
     case M_LIST:
       return (pat->not ^ (mutt_is_list_recipient (h->env->to) ||
                          mutt_is_list_recipient (h->env->cc)));
     case M_PERSONAL_RECIP:
       return (pat->not ^ (match_user (h->env->to) || match_user (h->env->cc)));
-      break;
     case M_PERSONAL_FROM:
       return (pat->not ^ (match_user (h->env->from)));
-      break;
 #ifdef _PGPPATH
-  case M_PGP_SIGN:
+   case M_PGP_SIGN:
      return (pat->not ^ (h->pgp & PGPSIGN));
-     break;
-  case M_PGP_ENCRYPT:
+   case M_PGP_ENCRYPT:
      return (pat->not ^ (h->pgp & PGPENCRYPT));
-     break;
+   case M_PGP_KEY:
+     return (pat->not ^ (h->pgp & PGPKEY));
 #endif
   }
   mutt_error (_("error: unknown op %d (report this error)."), pat->op);

diff --git a/po/mutt.pot b/po/mutt.pot
index 3c710ef3d9c3542a15f7fd3c35b13fde14ee0c95..94f40496bd0a289df9173b8089f29f828795ef0b 100644 (file)
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-15 18:17+0200\n"
+"POT-Creation-Date: 1998-10-15 21:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2152,50 +2152,50 @@ msgstr ""
 msgid "multipart message has no boundary parameter!"
 msgstr ""
 
-#: pattern.c:231
+#: pattern.c:234
 #, c-format
 msgid "Error in expression: %s"
 msgstr ""
 
-#: pattern.c:327
+#: pattern.c:330
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr ""
 
-#: pattern.c:341
+#: pattern.c:344
 #, c-format
 msgid "Invalid month: %s"
 msgstr ""
 
-#: pattern.c:395
+#: pattern.c:398
 msgid "error in expression"
 msgstr ""
 
-#: pattern.c:580 pattern.c:688
+#: pattern.c:583 pattern.c:691
 #, c-format
 msgid "error in pattern at: %s"
 msgstr ""
 
-#: pattern.c:628
+#: pattern.c:631
 #, c-format
 msgid "%c: invalid command"
 msgstr ""
 
-#: pattern.c:634
+#: pattern.c:637
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr ""
 
-#: pattern.c:647
+#: pattern.c:650
 msgid "missing parameter"
 msgstr ""
 
-#: pattern.c:663
+#: pattern.c:666
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr ""
 
-#: pattern.c:695
+#: pattern.c:698
 msgid "empty pattern"
 msgstr ""
 
@@ -2746,31 +2746,31 @@ msgstr ""
 msgid "Mail sent."
 msgstr ""
 
-#: sendlib.c:473
+#: sendlib.c:475
 msgid "No boundary parameter found! [report this error]"
 msgstr ""
 
-#: sendlib.c:507
+#: sendlib.c:509
 #, c-format
 msgid "%s no longer exists!"
 msgstr ""
 
-#: sendlib.c:773
+#: sendlib.c:775
 #, c-format
 msgid "Could not open %s"
 msgstr ""
 
-#: sendlib.c:1701
+#: sendlib.c:1703
 #, c-format
 msgid "Error sending message, child exited %d (%s).\n"
 msgstr ""
 
-#: sendlib.c:1703
+#: sendlib.c:1705
 #, c-format
 msgid "Saved output of child process to %s.\n"
 msgstr ""
 
-#: sendlib.c:1707
+#: sendlib.c:1709
 msgid "Error sending message."
 msgstr ""