From: pdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Thu, 25 Aug 2005 14:28:30 +0000 (+0000)
Subject: Rocco Rutte:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=73677f50e434a5c17a0d2c444dc2559c6540170b;ds=sidebyside

Rocco Rutte:
- merge in latest mutt changes


git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@438 e385b8ad-14ed-0310-8656-cc95a2468c6d
---

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index 81474fc..8ebdf5c 100644
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,4 +1,13 @@
-2005-08-22 16:10:50  Brendan Cully  <brendan@kublai.com>  (brendan)
+2005-08-24 15:17:43  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+	* pgp.c: Don't treat PGP inline signature verification errors as
+	fatal.
+
+2005-08-22 20:30:11  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+	* pgp.c: Pause after error message if PGP decode fails, in case
+	mutt_copy_message overwrites. Real error handling cleanup will have
+	to wait...
 
 	* pgp.c: Don't attempt to manipulate null pgp output file handles.
 
diff --git a/VERSION.date b/VERSION.date
index 283880d..db380c9 100644
--- a/VERSION.date
+++ b/VERSION.date
@@ -1 +1 @@
-20050824
+20050825
diff --git a/pgp.c b/pgp.c
index 779b2f4..b5eac0e 100644
--- a/pgp.c
+++ b/pgp.c
@@ -374,8 +374,9 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
           c = fgetc (pgpout);
           ungetc (c, pgpout);
         }
-        if (!pgpout || c == EOF) {
+        if (!cleansign && (!pgpout || c == EOF)) {
             mutt_error _("Could not decrypt PGP message");
+            mutt_sleep (1);
             pgp_void_passphrase ();
             rc = -1;
             goto out;