--- PATCHES Dec 2002 17:44:54 -0000	3.6
+++ PATCHES Mar 2003 11:05:29 -0000
@@ -0,0 +1 @@
+patch-1.5.4.dw.pgp-timeout.1
--- globals.h Mar 2003 07:52:49 -0000	3.5
+++ globals.h Mar 2003 11:05:29 -0000
@@ -178,3 +178,3 @@ WHERE REGEXP PgpGoodSign;
 WHERE char *PgpSignAs;
-WHERE short PgpTimeout;
+WHERE time_t PgpTimeout;
 WHERE char *PgpEntryFormat;
--- init.c Mar 2003 14:01:06 -0000	3.12
+++ init.c Mar 2003 11:05:29 -0000
@@ -1096,3 +1096,4 @@ static int parse_set (BUFFER *tmp, BUFFE
       short *ptr = (short *) MuttVars[idx].data;
-      int val;
+      long *lptr = (long *) MuttVars[idx].data;
+      long val;
       char *t;
@@ -1111,3 +1112,4 @@ static int parse_set (BUFFER *tmp, BUFFE
 
-      if (!*tmp->data || *t || (short) val != val)
+      if (!*tmp->data || *t ||
+	  (!(MuttVars[idx].type & DT_NUM_LONG) && (short) val != val))
       {
@@ -1117,2 +1119,4 @@ static int parse_set (BUFFER *tmp, BUFFE
       }
+      else if (MuttVars[idx].type & DT_NUM_LONG)
+	*lptr = val;
       else
--- init.h Mar 2003 09:17:32 -0000	3.36
+++ init.h Mar 2003 11:05:30 -0000
@@ -47,2 +47,3 @@
 #define DT_SORT_AUX	0x80
+#define DT_NUM_LONG	0x10
 
@@ -1379,3 +1380,3 @@ struct option_t MuttVars[] = {
   */
-  { "pgp_timeout",	DT_NUM,	 R_NONE, UL &PgpTimeout, 300 },
+  { "pgp_timeout",	DT_NUM|DT_NUM_LONG,	 R_NONE, UL &PgpTimeout, 300 },
   /*