*** empty log message ***

4 files changed, 40 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 12788ed3a5d..643234bcb0a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1825,6 +1825,10 @@ functionality with aliases for the mldrag functions.
 * Lisp changes made after edition 2.6 of the Emacs Lisp Manual,
 (Display-related features are described in a page of their own below.)
 
++++
+** The user-option `face-font-registry-alternatives' specifies
+alternative font registry names to try when looking for a font.
+
 ** Function `md5' calculates the MD5 "message digest"/"checksum",
 currently using the `md5sum' program.
 
@@ -2882,9 +2886,10 @@ that font selection first tries to find a good match for the font
 width specified by a face, then---within fonts with that width---tries
 to find a best match for the specified font height, etc.
 
-Setting `face-alternative-font-family-alist' allows the user to
-specify alternative font families to try if a family specified by a
-face doesn't exist.
+Setting `face-font-family-alternatives' allows the user to specify
+alternative font families to try if a family specified by a face
+doesn't exist.  Likewise, `face-font-registry-alternatives' allows to
+specify alternative font registry names to try.
 
 +++
 **** Scalable fonts
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fb830ecbb5..c8e92fbe9b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-10  Gerd Moellmann  <gerd@gnu.org>
+
+        * faces.el (face-font-registry-alternatives): New user-option.
+
 2000-11-10  Stefan Monnier  <monnier@cs.yale.edu>
 
         * textmodes/texinfo.el (texinfo-block-default): New var.
diff --git a/lispref/display.texi b/lispref/display.texi
index 995a43130ab..ddec9219648 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1857,8 +1857,8 @@ default one.  But if you put @code{:slant} before @code{:height}, the
 quite right.
 @end defvar
 
-@defvar face-alternative-font-family-alist
-@tindex face-alternative-font-family-alist
+@defvar face-font-family-alternatives
+@tindex face-font-family-alternatives
 This variable lets you specify alternative font families to try, if a
 given family is specified and doesn't exist.  Each element should have
 this form:
@@ -1872,6 +1872,21 @@ families given in @var{alternate-families}, one by one, until it finds a
 family that does exist.
 @end defvar
 
+@defvar face-font-registry-alternatives
+@tindex face-font-registry-alternatives
+This variable lets you specify alternative font registries to try, if a
+given registry is specified and doesn't exist.  Each element should have
+this form:
+
+@example
+(@var{registry} @var{alternate-registries}@dots{})
+@end example
+
+If @var{registry} is specified but not available, Emacs will try the
+other registries given in @var{alternate-registries}, one by one,
+until it finds a registry that does exist.
+@end defvar
+
   Emacs can make use of scalable fonts, but by default it does not use
 them, since the use of too many or too big scalable fonts can crash
 XFree86 servers.
diff --git a/src/ChangeLog b/src/ChangeLog
index 28a441ff68b..8f51a8fe9c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-10  Gerd Moellmann  <gerd@gnu.org>
+
+        * xfaces.c (Vface_alternative_font_registry_alist): New variable.
+        (font_list_1): Renamed from font_list.
+        (font_list): New function, trying alternative registries from
+        Vface_alternative_font_registry_alist.
+        (Finternal_set_alternative_font_registry_alist): New function.
+        (syms_of_xfaces): Initialize and Staticpro
+        Vface_alternative_font_registry_alist.  Defsubr
+        Finternal_set_alternative_font_registry_alist.
+
 2000-11-09  Ken Raeburn  <raeburn@gnu.org>
 
         * lisp.h (Flooking_at): Declare.