From: Gerd Moellmann Date: Tue, 18 Apr 2000 13:02:55 +0000 (+0000) Subject: (x_produce_glyphs) : Take into account X-Git-Tag: emacs-pretest-21.0.90~4215 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c7e22fd060aca74726588d4cdccdab4f9217595;p=emacs.git (x_produce_glyphs) : Take into account that the per-character metrics may be null. --- diff --git a/src/ChangeLog b/src/ChangeLog index 4d017ed8fd0..ea6b07e64af 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-04-18 Gerd Moellmann + + * xterm.c (x_produce_glyphs) : Take into account + that the per-character metrics may be null. + 2000-04-17 Gerd Moellmann * buffer.c (clone_per_buffer_values): New function. diff --git a/src/xterm.c b/src/xterm.c index b6714b84bee..f36e1e7761e 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -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 @@ x_produce_glyphs (it) /* 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; } }