X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pgp.c;h=3ed7d877bc5abf1de10fe5380ffbc531536104ca;hb=48d5c7532ee9fdfb5d1d06483ef6bf8e3b09891d;hp=45f7cf7f4d1468d471c17c1765cca24c64954c34;hpb=b17296ba049d71986028ac83f0b415a021d0691c;p=apps%2Fmadmutt.git

diff --git a/pgp.c b/pgp.c
index 45f7cf7..3ed7d87 100644
--- a/pgp.c
+++ b/pgp.c
@@ -110,7 +110,7 @@ int pgp_use_gpg_agent (void) {
     return 0;
 
   if ((tty = ttyname(0)))
-    setenv("GPG_TTY", tty, 0);
+    setenv ("GPG_TTY", tty, 0);
 
   return 1;
 }
@@ -375,6 +375,7 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
         }
 
         /* treat empty result as sign of failure */
+        /* TODO: maybe on failure mutt should include the original undecoded text. */
         if (pgpout) {
           rewind (pgpout);
           c = fgetc (pgpout);
@@ -384,8 +385,10 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
             mutt_error _("Could not decrypt PGP message");
             mutt_sleep (1);
             pgp_void_passphrase ();
-            rc = -1;
-            goto out;
+            if (!(s->flags & M_DISPLAY)) {
+              rc = -1;
+              goto out;
+            }
         }
       }