# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 863743373 0
# Node ID 281d99590839d1d5c5c956ca9829b18633d4ca81
# Parent  2c47fcd3beb7e2be2886347ad450b19d6d290bc9
(dumpglyphs): Draw glyphs one by one if the font for
them is narrower than required.
(x_connection_closed): Put # at the beginning of line.
(x_load_font): Cast to (char *) before assigning to FONTNAME.

diff -r 2c47fcd3beb7 -r 281d99590839 src/xterm.c
--- a/src/xterm.c	Thu May 15 22:07:16 1997 +0000
+++ b/src/xterm.c	Fri May 16 00:42:53 1997 +0000
@@ -896,10 +896,10 @@
 
 	    if (!cmpcharp)
 	      {
-		if (require_clipping)
+		if (require_clipping || FONT_WIDTH (font) != glyph_width)
 		  for (i = 0; i < len; i++)
 		    {
-		      if (i > 0) 
+		      if (require_clipping && i > 0) 
 			XSetClipOrigin (FRAME_X_DISPLAY (f), gc,
 					glyph_width * i, 0);
 		      if (background_filled)
@@ -5096,9 +5096,9 @@
 
   /* Indicate that this display is dead.  */
 
-  #ifdef USE_X_TOOLKIT
+#ifdef USE_X_TOOLKIT
   XtCloseDisplay (display);
-  #endif
+#endif
 
   dpyinfo->display = 0;
 
@@ -6416,7 +6416,7 @@
     unsigned long value;
 
     if (!NILP (font_names))
-      fontname = XSTRING (XCONS (font_names)->car)->data;
+      fontname = (char *) XSTRING (XCONS (font_names)->car)->data;
 
     BLOCK_INPUT;
     font = (XFontStruct *) XLoadQueryFont (FRAME_X_DISPLAY (f), fontname);