changeset 28629:437e522505fb

(x_produce_glyphs) <ASCII chars>: Take into account that the per-character metrics may be null.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 18 Apr 2000 13:01:48 +0000
parents 60285ddb5d02
children ca502ca29820
files src/xterm.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Mon Apr 17 16:08:26 2000 +0000
+++ b/src/xterm.c	Tue Apr 18 13:01:48 2000 +0000
@@ -1,5 +1,5 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999
+   Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -1884,8 +1884,7 @@
 	      /* If characters with lbearing or rbearing are displayed
 		 in this line, record that fact in a flag of the
 		 glyph row.  This is used to optimize X output code.  */
-	      if (pcm->lbearing < 0
-		  || pcm->rbearing > pcm->width)
+	      if (pcm && (pcm->lbearing < 0 || pcm->rbearing > pcm->width))
 		it->glyph_row->contains_overlapping_glyphs_p = 1;
 	    }
 	}