X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=etc%2Fsample.Xdefaults;h=2b512a41c23db797bd5bd6c20979e6f2263455d6;hb=1b70edcd9999965aafe4533453eb6b353b349898;hp=52199e87aa862d6d1850f11e08d247ad9c5fe8ab;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/etc/sample.Xdefaults b/etc/sample.Xdefaults
index 52199e8..2b512a4 100644
--- a/etc/sample.Xdefaults
+++ b/etc/sample.Xdefaults
@@ -75,6 +75,13 @@ Emacs*dialog*XmList*Background:		WhiteSmoke
 ! While this one is for Athena dialog boxes.
 Emacs*dialog*Command*Background:	WhiteSmoke
 
+! Athena dialog boxes are sometimes built with the Xaw3d
+! variant of the Athena toolkit.
+! XEmacs being nice to 8bit displays, it defaults to:
+Emacs*dialog*Command*beNiceToColormap:	true
+! If you are shocked by the ugliness of the 3d rendition,
+! you may want to set (even on 8bit displays) the above to false.
+
 ! Xlw Scrollbar colors
 Emacs*XlwScrollBar.Foreground:		Gray30
 Emacs*XlwScrollBar.Background:		Gray75
@@ -178,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':
 ! 
@@ -192,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