* 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.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/xfns.c b/src/xfns.c
index df2426f1e97..b4413e2e940 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -814,8 +814,10 @@ x_set_font (f, arg, oldval)
   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 @@ Returns an alist of the form ((top . TOP), (left . LEFT) ... ).")
   unsigned int width, height;
   Lisp_Object values[4];
 
-  check_x ();
   CHECK_STRING (string, 0);
 
   geometry = XParseGeometry ((char *) XSTRING (string)->data,