# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1248790767 -32400
# Node ID 4c1a8323aa9afe9de9e96f168fadfef70e252828
# Parent  f3a65dff191207a72613d7dee973c6157e48cac0
Fix incorrect Xft resources in Info docs.

diff -r f3a65dff1912 -r 4c1a8323aa9a man/ChangeLog
--- a/man/ChangeLog	Tue Jul 28 22:57:59 2009 +0900
+++ b/man/ChangeLog	Tue Jul 28 23:19:27 2009 +0900
@@ -1,3 +1,9 @@
+2009-07-08  Stephen Turnbull  <stephen@xemacs.org>
+
+	* xemacs/custom.texi (Xft Font Customization): Change references
+	from XftFont (now deprecated) to FcFontName.
+	Thanks, Raymond Toy <raymond.toy@stericsson.com>.
+
 2009-05-18  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.29 "garbanzo" is released.
diff -r f3a65dff1912 -r 4c1a8323aa9a man/xemacs/custom.texi
--- a/man/xemacs/custom.texi	Tue Jul 28 22:57:59 2009 +0900
+++ b/man/xemacs/custom.texi	Tue Jul 28 23:19:27 2009 +0900
@@ -2566,16 +2566,19 @@
 Here are the resources I use.  @strong{Warning:} @emph{This interface
 will change.  Pay attention to beta announcements, and complain loudly
 if changes aren't documented here!}  The tab control and menubar have
-separate Font and XftFont resources, and use the X resource manager to
-instantiate a FontStruct from the Font resource.  There is no converter
-facility for XftFont yet, and creating one that handles both FontStruct
-and XftFont depending on XEmacs's configuration and the font name seems
-error-prone at best.  Probably we will use a simple string
-representation for this resource, and convert to a face in XEmacs rather
-than a font in Xt/Xft.
+separate @code{Font} and @code{FcFontName} resources, and use the X
+resource manager to instantiate a FontStruct from the @code{Font}
+resource.  There is no converter facility for @code{FcFontName} yet, and
+creating one that handles both FontStruct and XftFont depending on
+XEmacs's configuration and the font name seems error-prone at best.
+Probably we will use a simple string representation for this resource,
+and convert to a face in XEmacs rather than a font in Xt/Xft.  (The
+older @code{XftFont} resource is deprecated.  There is code intended to
+implement backward compatibility, but there are repots that it doesn't
+work properly.)
 @example
-XEmacs*Tabs.xftFont: Bitstream Vera Sans-16
-XEmacs*menubar*xftFont: Bitstream Vera Sans-16
+XEmacs*Tabs.fcFontName: Bitstream Vera Sans-16
+XEmacs*menubar*fcFontName: Bitstream Vera Sans-16
 XEmacs.modeline.attributeFont: Bitstream Charter-16
 XEmacs.default.attributeFont: Bitstream Vera Sans Mono-16
 @end example