new patch to do a better debug, some minor changes to hyphen-as-minus.patch

[software/mutt-debian.git] / debian / patches / features-old / patch-1.5.4.vk.pgp_verbose_mime

diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
index de5a7acd8ad9fd9fc2631d1759b8023019492b9e..e3989f74027deb9a78cda6e465f3cab8de7064d6 100644 (file)
--- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
+++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
@@ -2,7 +2,7 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
 
 --- a/globals.h
 +++ b/globals.h
-@@ -241,6 +241,8 @@
+@@ -242,6 +242,8 @@
  WHERE char *PgpListSecringCommand;
  WHERE char *PgpListPubringCommand;
  WHERE char *PgpGetkeysCommand;
@@ -13,9 +13,9 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
  WHERE char *SmimeDefaultKey;
 --- a/init.h
 +++ b/init.h
-@@ -1790,6 +1790,18 @@
-   ** checked with the \fC$<check-traditional-pgp>\fP function, mutt will automatically
-   ** check the message for traditional pgp.
+@@ -2551,6 +2551,18 @@
+   ** a line quoted text if it also matches $$smileys. This mostly
+   ** happens at the beginning of a line.
    */
 +  { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
 +  /*
@@ -30,11 +30,11 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
 +  ** PGP/MIME signed messages.
 +  */
  
-   /* XXX Default values! */
+ 
  
 --- a/pgp.c
 +++ b/pgp.c
-@@ -1113,6 +1113,8 @@
+@@ -1131,6 +1131,8 @@
    t->disposition = DISPINLINE;
    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */