diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 22:14:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 22:14:06 -0700 |
| commit | 625a3eb1e23bd4000230946eadb419d5c454845b (patch) | |
| tree | b95a60326c834c0aeaf3fbdc9bc5009e0ed38ca3 | |
| parent | bc7b66973101bbf8444e60f9f9e46bfc3f6bdab1 (diff) | |
| download | emacs-625a3eb1e23bd4000230946eadb419d5c454845b.tar.gz | |
* xfont.c (xfont_open): Avoid unnecessary tests.
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xfont.c | 29 |
2 files changed, 17 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 65488a6eedd..d489dcd58b3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,7 @@ 2011-04-05 Paul Eggert <eggert@cs.ucla.edu> * xfont.c (xfont_text_extents): Remove var that was set but not used. + (xfont_open): Avoid unnecessary tests. * composite.c (composition_gstring_put_cache): Use unsigned integer. diff --git a/src/xfont.c b/src/xfont.c index 8a3cacdd9f5..eaa1a3ea59b 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -844,22 +844,25 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) font->average_width = XINT (val) / 10; if (font->average_width < 0) font->average_width = - font->average_width; - if (font->average_width == 0 - && encoding->ascii_compatible_p) + else { - int width = font->space_width, n = pcm != NULL; + if (font->average_width == 0 + && encoding->ascii_compatible_p) + { + int width = font->space_width, n = pcm != NULL; - for (char2b.byte2 = 33; char2b.byte2 <= 126; char2b.byte2++) - if ((pcm = xfont_get_pcm (xfont, &char2b)) != NULL) - width += pcm->width, n++; - if (n > 0) - font->average_width = width / n; + for (char2b.byte2 = 33; char2b.byte2 <= 126; char2b.byte2++) + if ((pcm = xfont_get_pcm (xfont, &char2b)) != NULL) + width += pcm->width, n++; + if (n > 0) + font->average_width = width / n; + } + if (font->average_width == 0) + /* No easy way other than this to get a reasonable + average_width. */ + font->average_width + = (xfont->min_bounds.width + xfont->max_bounds.width) / 2; } - if (font->average_width == 0) - /* No easy way other than this to get a reasonable - average_width. */ - font->average_width - = (xfont->min_bounds.width + xfont->max_bounds.width) / 2; } BLOCK_INPUT; |