- unstatic menu_prev/next_entry

[packages/mutt.git] / mutt-pgp_hook.patch

diff --git a/mutt-pgp_hook.patch b/mutt-pgp_hook.patch
index c63c26cf377c521a2a72cffc72a5c0b3622c5c17..8c77a611e2473511dd2d2cd36ad824e9d240c42b 100644 (file)
--- a/mutt-pgp_hook.patch
+++ b/mutt-pgp_hook.patch
@@ -3,17 +3,23 @@
 @@ -0,0 +1,2 @@
 +patch-1.5.6.dw.confirm-crypt-hook.1
 +patch-1.5.6.dw.multiple-crypt-hook.2
---- crypt-hook-both/hook.c Jan 2004 09:52:55 -0000     3.8
-+++ crypt-hook-both/hook.c Feb 2004 13:19:43 -0000
-@@ -119,3 +119,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
+--- mutt-1.5.15/hook.c.orig    2007-06-03 14:10:28.090351677 +0200
++++ mutt-1.5.15/hook.c 2007-06-03 14:12:17.468584787 +0200
+@@ -139,7 +139,11 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
+       ptr->rx.not == not &&
+       !mutt_strcmp (pattern.data, ptr->rx.pattern))
      {
 +#ifdef M_CRYPTHOOK
-+      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK | M_CRYPTHOOK))
++      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK | M_CRYPTHOOK))
 +#else
-       if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
+       if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
 +#endif
        {
-@@ -445,5 +449,21 @@ char *mutt_iconv_hook (const char *chs)
+       /* these hooks allow multiple commands with the same
+        * pattern, so if we've already seen this pattern/command pair, just
+@@ -466,9 +470,25 @@ char *mutt_iconv_hook (const char *chs)
+   return _mutt_string_hook (chs, M_ICONVHOOK);
+ }
  
 -char *mutt_crypt_hook (ADDRESS *adr)
 +LIST *mutt_crypt_hook (ADDRESS *adr)
@@ -37,6 +43,8 @@
 +  }
 +  return (key_list);
  }
+ 
+ #ifdef USE_SOCKET
 --- crypt-hook-both/init.h Feb 2004 17:10:43 -0000     3.43
 +++ crypt-hook-both/init.h Feb 2004 13:19:43 -0000
 @@ -1230,2 +1230,11 @@ struct option_t MuttVars[] = {
@@ -212,15 +220,19 @@
 -char *mutt_crypt_hook (ADDRESS *);
 +LIST *mutt_crypt_hook (ADDRESS *);
  char *mutt_make_date (char *, size_t);
---- crypt-hook-both/doc/manual.sgml.head Feb 2004 17:45:33 -0000       3.26
-+++ crypt-hook-both/doc/manual.sgml.head Feb 2004 13:19:44 -0000
-@@ -1450,3 +1450,5 @@ normally use.  The crypt-hook command pr
- specify the ID of the public key to be used when encrypting messages to
--a certain recipient.
-+a certain recipient.  You may use multiple pgp-hook's with the same
-+pattern; multiple matching pgp-hook's result in the use of multiple
+--- crypt-hook-both/doc/manual.xml.head Feb 2004 17:45:33 -0000        3.26
++++ crypt-hook-both/doc/manual.xml.head Feb 2004 13:19:44 -0000
+@@ -3293,7 +3293,9 @@
+ or because, for some reasons, you need to override the key Mutt would
+ normally use.  The <literal>crypt-hook</literal> command provides a
+ method by which you can specify the ID of the public key to be used
+-when encrypting messages to a certain recipient.
++when encrypting messages to a certain recipient. You may use multiple pgp-hook's
++with the same pattern; multiple matching pgp-hook's result in the use of multiple
 +keyids for recipient.
+ </para>
  
+ <para>
 --- crypt-hook-both/doc/muttrc.man.head Feb 2004 17:10:43 -0000        3.10
 +++ crypt-hook-both/doc/muttrc.man.head Feb 2004 13:19:44 -0000
 @@ -297,3 +297,6 @@ to a certain recipient.  The meaning of