[Emacs-diffs] /srv/bzr/emacs/trunk r106649: Minor improvement in MS-Windows specific usage info.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106649
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-10 11:12:00 +0200
message:
  Minor improvement in MS-Windows specific usage info.
  
   doc/emacs/msdog.texi (Windows Fonts): Document how to force GDI font
   backend on MS-Windows.
modified:
  doc/emacs/ChangeLog
  doc/emacs/msdog.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-12-10 07:39:43 +0000
+++ b/doc/emacs/ChangeLog       2011-12-10 09:12:00 +0000
@@ -1,3 +1,8 @@
+2011-12-10  Eli Zaretskii  <address@hidden>
+
+       * msdog.texi (Windows Fonts): Document how to force GDI font
+       backend on MS-Windows.
+
 2011-12-10  Chong Yidong  <address@hidden>
 
        * building.texi (Compilation): Say what the -k flag to make does.

=== modified file 'doc/emacs/msdog.texi'
--- a/doc/emacs/msdog.texi      2011-11-20 19:35:27 +0000
+++ b/doc/emacs/msdog.texi      2011-12-10 09:12:00 +0000
@@ -863,15 +863,22 @@
 
   The old XLFD based format is also supported for backwards compatibility.
 
-  Emacs 23 supports a number of backends.  Currently, the @code{gdi}
-and @code{uniscribe} font backends are supported on Windows.  The
address@hidden font backend is available on all versions of Windows, and
-supports all fonts that are natively supported by Windows.  The
address@hidden font backend selection (MS-Windows)
+  Emacs 23 and later supports a number of font backends.  Currently,
+the @code{gdi} and @code{uniscribe} backends are supported on Windows.
+The @code{gdi} font backend is available on all versions of Windows,
+and supports all fonts that are natively supported by Windows.  The
 @code{uniscribe} font backend is available on Windows 2000 and later,
 and supports TrueType and OpenType fonts.  Some languages requiring
-complex layout can only be properly supported by the uniscribe
+complex layout can only be properly supported by the Uniscribe
 backend.  By default, both backends are enabled if supported, with
address@hidden taking priority over @code{gdi}.
address@hidden taking priority over @code{gdi}.  To override that
+and use the GDI backend even if Uniscribe is available, invoke Emacs
+with the @kbd{-xrm Emacs.fontBackend:gdi} command-line argument, or
+add a @code{Emacs.fontBackend} resource with the value @code{gdi} in
+the Registry under either the
address@hidden or the
address@hidden key (@pxref{Resources}).
 
 @cindex font properties (MS Windows)
 @noindent