--- pine/pine.h.orig	Wed Nov 17 08:14:14 1999
+++ pine/pine.h	Fri Nov 19 16:18:24 1999
@@ -357,7 +357,7 @@
 			   && (s) && !strucmp((s),"X-VCARD")))
 #define	MIME_VCARD_A(a)	MIME_VCARD((a)->body->type, (a)->body->subtype)
 
-#define STYLE_NAME(a)   ((a)->text.desc ? (a)->text.desc : "text")
+#define STYLE_NAME(a)   ((a)->text.desc ? (a)->text.desc : "r")
 
 
 /*
@@ -1875,94 +1875,94 @@
  * Some standard Key/Command Bindings 
  */
 #define	NULL_MENU	{NULL, NULL, {MC_NONE}, KS_NONE}
-#define	HELP_MENU	{"?", "Help", \
+#define	HELP_MENU	{"?", "U", \
 			 {MC_HELP, 2, {'?',ctrl('G')}}, \
 			 KS_SCREENHELP}
-#define	OTHER_MENU	{"O", "OTHER CMDS", \
+#define	OTHER_MENU	{"O", "LRO", \
 			 {MC_OTHER, 1, {'o'}}, \
 			 KS_NONE}
-#define	WHEREIS_MENU	{"W", "WhereIs", \
+#define	WHEREIS_MENU	{"W", "jM", \
 			 {MC_WHEREIS, 2, {'w',ctrl('W')}}, \
 			 KS_WHEREIS}
-#define	MAIN_MENU	{"M", "Main Menu", \
+#define	MAIN_MENU	{"M", "D", \
 			 {MC_MAIN, 1, {'m'}}, \
 			 KS_MAINMENU}
-#define	QUIT_MENU	{"Q", "Quit Pine", \
+#define	QUIT_MENU	{"Q", " Pine", \
 			 {MC_QUIT, 1, {'q'}}, \
 			 KS_EXIT}
-#define	PREVMSG_MENU	{"P", "PrevMsg", \
+#define	PREVMSG_MENU	{"P", "e@", \
 			 {MC_PREVITEM, 1, {'p'}}, \
 			 KS_PREVMSG}
-#define	NEXTMSG_MENU	{"N", "NextMsg", \
+#define	NEXTMSG_MENU	{"N", "U@", \
 			 {MC_NEXTITEM, 1, {'n'}}, \
 			 KS_NEXTMSG}
-#define	PREVPAGE_MENU	{"-", "PrevPage", \
+#define	PREVPAGE_MENU	{"-", "e@", \
 			 {MC_PAGEUP, 3, {'-',ctrl('Y'),KEY_PGUP}}, \
 			 KS_PREVPAGE}
-#define	NEXTPAGE_MENU	{"Spc", "NextPage", \
+#define	NEXTPAGE_MENU	{"Spc", "U@", \
 			 {MC_PAGEDN, 4, {'+',' ',ctrl('V'),KEY_PGDN}}, \
 			 KS_NEXTPAGE}
-#define	JUMP_MENU	{"J", "Jump", \
+#define	JUMP_MENU	{"J", "", \
 			 {MC_JUMP, 1, {'j'}}, \
 			 KS_JUMPTOMSG}
-#define	FWDEMAIL_MENU	{"F", "Fwd Email", \
+#define	FWDEMAIL_MENU	{"F", "HH", \
 			{MC_FWDTEXT,1,{'f'}}, \
 			 KS_FORWARD}
-#define	PRYNTMSG_MENU	{"%", "Print", \
+#define	PRYNTMSG_MENU	{"%", "CL", \
 			 {MC_PRINTMSG,1,{'%'}}, \
 			 KS_PRINT}
-#define	PRYNTTXT_MENU	{"%", "Print", \
+#define	PRYNTTXT_MENU	{"%", "CL", \
 			 {MC_PRINTTXT,1,{'%'}}, \
 			 KS_PRINT}
-#define	SAVE_MENU	{"S", "Save", \
+#define	SAVE_MENU	{"S", "s", \
 			 {MC_SAVE,1,{'s'}}, \
 			 KS_SAVE}
-#define	EXPORT_MENU	{"E", "Export", \
+#define	EXPORT_MENU	{"E", "ץX", \
 			 {MC_EXPORT, 1, {'e'}}, \
 			 KS_EXPORT}
-#define	COMPOSE_MENU	{"C", "Compose", \
+#define	COMPOSE_MENU	{"C", "s", \
 			 {MC_COMPOSE,1,{'c'}}, \
 			 KS_COMPOSER}
-#define	RCOMPOSE_MENU	{"#", "Role", \
+#define	RCOMPOSE_MENU	{"#", "", \
 			 {MC_ROLE,1,{'#'}}, \
 			 KS_NONE}
-#define	DELETE_MENU	{"D", "Delete", \
+#define	DELETE_MENU	{"D", "R", \
 			 {MC_DELETE,2,{'d',KEY_DEL}}, \
 			 KS_DELETE}
-#define	UNDELETE_MENU	{"U", "Undelete", \
+#define	UNDELETE_MENU	{"U", "_R", \
 			 {MC_UNDELETE,1,{'u'}}, \
 			 KS_UNDELETE}
-#define	REPLY_MENU	{"R", "Reply", \
+#define	REPLY_MENU	{"R", "^", \
 			 {MC_REPLY,1,{'r'}}, \
 			 KS_REPLY}
-#define	FORWARD_MENU	{"F", "Forward", \
+#define	FORWARD_MENU	{"F", "H", \
 			 {MC_FORWARD,1,{'f'}}, \
 			 KS_FORWARD}
-#define	LISTFLD_MENU	{"L", "ListFldrs", \
+#define	LISTFLD_MENU	{"L", "ƧXC", \
 			 {MC_COLLECTIONS,1,{'l'}}, \
 			 KS_FLDRLIST}
-#define	INDEX_MENU	{"I", "Index", \
+#define	INDEX_MENU	{"I", "", \
 			 {MC_INDEX,1,{'i'}}, \
 			 KS_FLDRINDEX}
-#define	GOTO_MENU	{"G", "GotoFldr", \
+#define	GOTO_MENU	{"G", "ƧX", \
 			 {MC_GOTO,1,{'g'}}, \
 			 KS_GOTOFLDR}
-#define	TAKE_MENU	{"T", "TakeAddr", \
+#define	TAKE_MENU	{"T", "oa}", \
 			 {MC_TAKE,1,{'t'}}, \
 			 KS_TAKEADDR}
-#define	FLAG_MENU	{"*", "Flag", \
+#define	FLAG_MENU	{"*", "X", \
 			 {MC_FLAG,1,{'*'}}, \
 			 KS_FLAG}
-#define	PIPE_MENU	{"|", "Pipe", \
+#define	PIPE_MENU	{"|", "ɦV(Pipe)", \
 			 {MC_PIPE,1,{'|'}}, \
 			 KS_NONE}
-#define	BOUNCE_MENU	{"B", "Bounce", \
+#define	BOUNCE_MENU	{"B", "hH", \
 			 {MC_BOUNCE,1,{'b'}}, \
 			 KS_BOUNCE}
-#define	HDRMODE_MENU	{"H", "HdrMode", \
+#define	HDRMODE_MENU	{"H", "Y", \
 			 {MC_FULLHDR,1,{'h'}}, \
 			 KS_HDRMODE}
-#define	TAB_MENU	{"Tab", "NextNew", \
+#define	TAB_MENU	{"Tab", "U@ӷs", \
 			 {MC_TAB,1,{TAB}}, \
 			 KS_NONE}
 
@@ -2831,7 +2831,7 @@
 } ATABLE_S;
 
 
-#define TAG_EMBED	'\377'	/* Announces embedded data in text string */
+#define TAG_EMBED	'\001'	/* Announces embedded data in text string */
 #define	TAG_INVON	'\001'	/* Supported character attributes	  */
 #define	TAG_INVOFF	'\002'
 #define	TAG_BOLDON	'\003'
