Changelog:

   * unused GFHP_NOWRAP removed,

   * GFHP_HANDLES was moved to bk-cleanup-GFHP_HANDLES.patch

--- pine4.64/pine/pine.h

+++ pine4.64/pine/pine.h

@@ -68,6 +68,7 @@

 #define	PHONE_HOME_HOST		"docserver.cac.washington.edu"

 #define UNKNOWN_CHARSET		"X-UNKNOWN"

+#define US_ASCII_CHARSET	"US-ASCII"

 #define OUR_HDRS_LIST		"X-Our-Headers"

@@ -3675,6 +3676,7 @@

     } data;

 } REPLY_S;

+#define pico(F) call_pico(F)

 #define	REPLY_PSEUDO	1

 #define	REPLY_FORW	2	/* very similar to REPLY_PSEUDO */

 #define	REPLY_MSGNO	3

@@ -4231,7 +4233,6 @@

 } ATABLE_S;

-#define TAG_EMBED	'\377'	/* Announces embedded data in text string */

 #define	TAG_INVON	'\001'	/* Supported character attributes	  */

 #define	TAG_INVOFF	'\002'

 #define	TAG_BOLDON	'\003'

@@ -4241,6 +4242,7 @@

 #define	TAG_FGCOLOR	'\010'	/* Change to this foreground color	  */

 #define	TAG_BGCOLOR	'\011'	/* Change to this background color	  */

 #define	TAG_HANDLE	'\020'	/* indicate's a handle to an action	  */

+#define	TAG_EMBED       '\021'	/* Announces embedded data in text string */

 #define	TAG_HANDLEOFF	'\030'	/* indicate's end of handle text	  */

@@ -5735,6 +5737,9 @@

 int	    rfc2369_parse_fields PROTO((char *, RFC2369_S *));

 unsigned char *trans_euc_to_2022_jp PROTO((unsigned char *));

 unsigned char *trans_2022_jp_to_euc PROTO((unsigned char *, unsigned int *));

+unsigned char* resolve_charset_alias PROTO((char *, char **));

+char          *pine_check_utf8 PROTO((char *, char *, size_t));

+unsigned char *trans_with_iconv PROTO((unsigned char *, char *, char *));

 char       *keyword_to_nick PROTO((char *));

 void        find_8bitsubj_in_messages PROTO((MAILSTREAM *, SEARCHSET *,

 					     int, int));

--- pine4.64/pine/send.c

+++ pine4.64/pine/send.c

@@ -11119,3 +11119,16 @@

 {

     return(0L);

 }

+

+int

+call_pico (ps)

+	struct pico_struct * ps;

+{

+	int ret;

+	char * assumed_save = ps_global->VAR_ASSUMED_CHAR_SET;

+	ps_global->VAR_ASSUMED_CHAR_SET = NULL;

+#undef pico

+	ret = pico(ps);

+	ps_global->VAR_ASSUMED_CHAR_SET = assumed_save;

+	return ret;

+}