# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 738255812 0
# Node ID fac66d9828d7ef8807f9092a60f91d31f91f089b
# Parent  a416873d97e5bf404c4dd1e535b3a3711c2bcdc4
	* xterm.c (x_new_font): Reject fonts with varying spacing.  We
	don't support them yet.
	* xfns.c (x_set_font): Report the error message properly.

	* xfns.c (Fx_parse_geometry): No need to call check_x here; it
	doesn't interact with the server at all, and we need it in order
	to create our first frame.

diff -r a416873d97e5 -r fac66d9828d7 src/xfns.c
--- a/src/xfns.c	Mon May 24 15:01:31 1993 +0000
+++ b/src/xfns.c	Mon May 24 15:03:32 1993 +0000
@@ -814,8 +814,10 @@
   result = x_new_font (f, name);
   UNBLOCK_INPUT;
   
-  if (result)
+  if (result == 1)
     error ("Font \"%s\" is not defined", name);
+  if (result == 2)
+    error ("the characters of the given font have varying widths");
 }
 
 void
@@ -1513,7 +1515,6 @@
   unsigned int width, height;
   Lisp_Object values[4];
 
-  check_x ();
   CHECK_STRING (string, 0);
 
   geometry = XParseGeometry ((char *) XSTRING (string)->data,