Changeset 3646:2b649fd03f1e for commands.c

Timestamp:

2004-04-12 13:33:33 (5 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

A belated fix for #1808 (Debian #233106): Make sure
check-traditional-pgp doesn't leave the pager context unnecessarily.
This makes message-hooks like this one safe:

message-hook '!(~g|~G) ~b"^{-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' \}

"exec check-traditional-pgp"

Files:

• commands.c (modified) (2 diffs)

commands.c

@@ -942 +942 @@
   int rv = 0;
   
+  h->security |= PGP_TRADITIONAL_CHECKED;
+  
   mutt_parse_mime_message (Context, h);
   if ((msg = mx_open_message (Context, h->msgno)) == NULL)
@@ -960 +962 @@
   int i;
   int rv = 0;
-  if (h)
+  if (h && !(h->security & PGP_TRADITIONAL_CHECKED))
     rv = _mutt_check_traditional_pgp (h, redraw);
   else
   {
     for (i = 0; i < Context->vcount; i++)
-      if (Context->hdrs[Context->v2r[i]]->tagged)
+      if (Context->hdrs[Context->v2r[i]]->tagged && !(h->security & PGP_TRADITIONAL_CHECKED))
         rv = _mutt_check_traditional_pgp (Context->hdrs[Context->v2r[i]], redraw)
           || rv;