X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=etc%2Fsample.Xdefaults;h=2b512a41c23db797bd5bd6c20979e6f2263455d6;hp=71151aaaaa6ea58a7d73d0c1e64153dbd4ea3a0b;hb=43832d21823b1480b4d0d5ddd10ed70cf37ea91c;hpb=afa9772e3fcbb4e80e3e4cfd1a40b4fccc6d08b8

diff --git a/etc/sample.Xdefaults b/etc/sample.Xdefaults
index 71151aa..2b512a4 100644
--- a/etc/sample.Xdefaults
+++ b/etc/sample.Xdefaults
@@ -185,7 +185,12 @@ Emacs*toolBarShadowThickness:		2
 ! some other font to use for it here:
 ! 
 ! Emacs.italic.attributeFont:  -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-*
-!
+! 
+! If you choose a font which does not have a bold-italic version,
+! you can specify some other font to use for it here:
+! 
+! Emacs.bold-italic.attributeFont:  -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-*
+! 
 ! And here is how you would set the background color of the `highlight' face,
 ! but only on the screen named `debugger':
 ! 
@@ -199,8 +204,27 @@ Emacs*toolBarShadowThickness:		2
 ! Note that the menubar resources do not use the `face' syntax, since they
 ! are X toolkit widgets and thus outside the domain of XEmacs proper.
 ! 
-Emacs*menubar*Font: 		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-Emacs*popup*Font:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+! When X Font Sets are enabled with ./configure --with-xfs (eg, for
+! multilingual menubars and XIM), some .font resources (those specific to
+! the Lucid widget set) are ignored in favor of .fontSet resources.
+! Note that you need to use fontSet (or FontSet) in that case even if you
+! want to specify one font:
+!
+! *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+!
+! There is no harm in having both resources set, except for the confusion
+! you suffer.  Sorry; that's the price of backward compatibility.
+!
+*menubar*Font:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*popup*Font:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
+			-*-*-*-*-*-*-*-120-*-iso10646-1, \
+			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+*popup*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
+			-*-*-*-*-*-*-*-120-*-iso10646-1, \
+			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
 
 ! Font in the Motif dialog boxes.
 ! (Motif uses `fontList' while most other things use `font' - if you don't