# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1236700654 0
# Node ID 58ec78703942b381e9f19bcd836bf5bd470cfb8c
# Parent  02f766280fadf7c3f665d35a6da4e07b9ab1f269
* w32-vars.el (w32-list-proportional-fonts): Make obsolete.

* msdog.texi (Windows Misc): Remove doc for obsolete variable.  Modify
w32-use-visible-system-caret doc to indicate that it should get set
automatically.
(Windows Fonts): Add doc for the uniscribe backend.

diff -r 02f766280fad -r 58ec78703942 doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Tue Mar 10 14:08:52 2009 +0000
+++ b/doc/emacs/ChangeLog	Tue Mar 10 15:57:34 2009 +0000
@@ -1,3 +1,10 @@
+2009-03-10  Jason Rumney  <jasonr@gnu.org>
+
+	* msdog.texi (Windows Misc): Remove doc for obsolete variable.  Modify
+	w32-use-visible-system-caret doc to indicate that it should get set
+	automatically.
+	(Windows Fonts): Add doc for the uniscribe backend.
+
 2009-03-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* maintaining.texi (VC Directory Commands): Fix doc for the x key in
diff -r 02f766280fad -r 58ec78703942 doc/emacs/msdog.texi
--- a/doc/emacs/msdog.texi	Tue Mar 10 14:08:52 2009 +0000
+++ b/doc/emacs/msdog.texi	Tue Mar 10 15:57:34 2009 +0000
@@ -783,7 +783,14 @@
   The old XLFD based format is also supported for backwards compatibility.
 
   Emacs 23 supports a number of backends.  Currently, the @code{gdi}
-font backend is supported on Windows.
+and @code{uniscribe} font 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
+backend. By default, both backends are enabled if supported, with
+@code{uniscribe} taking priority over @code{gdi}.
 
 @cindex font properties (MS Windows)
 @noindent
@@ -881,12 +888,14 @@
 @vindex w32-use-visible-system-caret
 @cindex screen reader software, MS-Windows
   The variable @code{w32-use-visible-system-caret} is a flag that
-determines whether to make the system caret visible.  The default is
-@code{nil}, which means Emacs draws its own cursor to indicate the
-position of point.  A non-@code{nil} value means Emacs will indicate
-point location by the system caret; this facilitates use of screen
-reader software.  When this variable is non-@code{nil}, other
-variables affecting the cursor display have no effect.
+determines whether to make the system caret visible.  The default when
+no screen reader software is in use is @code{nil}, which means Emacs
+draws its own cursor to indicate the position of point.  A
+non-@code{nil} value means Emacs will indicate point location by the
+system caret; this facilitates use of screen reader software, and is
+the default when such software is detected when running Emacs.
+When this variable is non-@code{nil}, other variables affecting the
+cursor display have no effect.
 
 @iftex
 @inforef{Windows Misc, , emacs}, for information about additional
@@ -900,12 +909,6 @@
 non-@code{nil} value causes a frame to grab focus when it is raised.
 The default is @code{t}, which fits well with the Windows default
 click-to-focus policy.
-
-@vindex w32-list-proportional-fonts
-  The variable @code{w32-list-proportional-fonts} controls whether
-proportional fonts are included in the font selection dialog.  If its
-value is non-@code{nil}, these fonts will be included.  The default is
-@code{nil}.
 @end ifnottex
 
 @ifnottex
diff -r 02f766280fad -r 58ec78703942 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Mar 10 14:08:52 2009 +0000
+++ b/lisp/ChangeLog	Tue Mar 10 15:57:34 2009 +0000
@@ -1,3 +1,7 @@
+2009-03-10  Jason Rumney  <jasonr@gnu.org>
+
+	* w32-vars.el (w32-list-proportional-fonts): Make obsolete.
+
 2009-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* server.el (server-process-filter): Use expand-file-name rather than
diff -r 02f766280fad -r 58ec78703942 lisp/w32-vars.el
--- a/lisp/w32-vars.el	Tue Mar 10 14:08:52 2009 +0000
+++ b/lisp/w32-vars.el	Tue Mar 10 15:57:34 2009 +0000
@@ -40,10 +40,9 @@
   :type 'boolean
   :group 'w32)
 
-(defcustom w32-list-proportional-fonts nil
-  "Include proportional fonts in the default font dialog."
-  :type 'boolean
-  :group 'w32)
+(defvar w32-list-proportional-fonts nil
+  "Include proportional fonts in the default font dialog.")
+(make-obsolete-variable w32-list-proportional-fonts "No longer used" "23.1")
 
 (defcustom w32-allow-system-shell nil
   "Disable startup warning when using \"system\" shells."