0b00e9a
--- etc/Emacs.ad.orig	2013-08-21 11:43:43.000000000 -0600
0b00e9a
+++ etc/Emacs.ad	2013-10-24 20:00:00.000000000 -0600
0b00e9a
@@ -222,36 +222,40 @@
3206138
 ! *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
3206138
 !			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0
3206138
 !
3206138
-*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
3206138
-*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
0b00e9a
-*menubar*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
3206138
+*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
3206138
+*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
9f259eb
+
9f259eb
+XEmacs*FontSet:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \
0b00e9a
+				-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \
9f259eb
+				*
0b00e9a
+*menubar*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \
7e0999b
  			        -*-*-*-*-*-*-*-120-*-iso10646-1, \
7e0999b
  			        -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
0b00e9a
  			        -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
0b00e9a
-*popup*FontSet:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
0b00e9a
+*popup*FontSet:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \
0b00e9a
    			        -*-*-*-*-*-*-*-120-*-iso10646-1, \
0b00e9a
  			        -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
0b00e9a
  			        -*-*-*-*-*-*-*-120-*-jisx0201.1976-0
6173cdc
 
6173cdc
 ! Gui elements share this font
6173cdc
 !
aa5e6cd
-Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
aa5e6cd
+Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
aa5e6cd
 
aa5e6cd
 ! Font in the Motif dialog boxes.
aa5e6cd
 ! (Motif uses `fontList' while most other things use `font' - if you don't
0b00e9a
 ! know why you probably don't want to.)
0b00e9a
 ! 
0b00e9a
-*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
0b00e9a
-*XmTextField*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
0b00e9a
-*XmText*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
0b00e9a
-*XmList*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
0b00e9a
+*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
0b00e9a
+*XmTextField*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
0b00e9a
+*XmText*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
0b00e9a
+*XmList*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
0b00e9a
 
0b00e9a
 ! Font in the Athena dialog boxes.
0b00e9a
 ! I think 14-point looks nicer than 12-point.
5047c68
 ! Some people use 12-point anyway because you get more text, but
5047c68
 ! there's no purpose at all in doing this for dialog boxes.
5047c68
 
5047c68
-*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
5047c68
+*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
5047c68
 
5047c68
 ! Dialog box translations.
5047c68
 ! =======================
0b00e9a
--- lwlib/xlwmenu.c.orig	2013-08-21 11:43:43.000000000 -0600
0b00e9a
+++ lwlib/xlwmenu.c	2013-10-24 20:00:00.000000000 -0600
0b00e9a
@@ -108,7 +108,7 @@
0b00e9a
      /* We must use an iso8859-1 font here, or people without $LANG set lose.
0b00e9a
 	It's fair to assume that those who do have $LANG set also have the
0b00e9a
 	*fontList resource set, or at least know how to deal with this. */
0b00e9a
-     XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"),
0b00e9a
+     XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-1"),
0b00e9a
 #else
0b00e9a
   fontres (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font,
0b00e9a
 	   "XtDefaultFont"),